[Pkg-vsquare-devel] Bug#417047: Patch to fix FTBFS on amd64

[Michael Bienia]

tags 417047 + patch
user ubuntu-devel at lists.ubuntu.com
usertag 417047 + ubuntu-patch hardy
thanks

Hello,

here is the patch I applied to the Ubuntu package of umview to get it at
least build successfully on amd64. I don't know yet if the resulting deb
also works properly on amd64.

Regards,
Michael

--- umview-0.4a.orig/um-viewos/scmap.c
+++ umview-0.4a/um-viewos/scmap.c
@@ -188,7 +188,9 @@
 	{__NR_fcntl,	choice_fd,	wrap_in_fcntl, wrap_out_fcntl,	nchoice_fd,	nw_sysfd_std, 0,	3, SOC_FILE},
 	{__NR_fcntl64,	choice_fd,	wrap_in_fcntl, wrap_out_fcntl,	nchoice_fd,	nw_sysfd_std, 0,	3, SOC_FILE},
 	{__NR_lseek,	choice_fd,	wrap_in_lseek, wrap_out_std,	nchoice_fd,	nw_sysfd_std, 0,	3, SOC_FILE},
+#ifdef __NR__llseek
 	{__NR__llseek,	choice_fd,	wrap_in_llseek, wrap_out_std,	nchoice_fd,	nw_sysfd_std, 0,	5, SOC_FILE},
+#endif
 	{__NR_mkdir,	choice_link,	wrap_in_mkdir, wrap_out_std,	nchoice_link,	nw_syspath_std, 0,	2, SOC_FILE},
 	{__NR_rmdir,	choice_path,	wrap_in_unlink, wrap_out_std,	nchoice_path,	nw_syspath_std, 0,	1, SOC_FILE},
 	{__NR_link,	choice_link2,	wrap_in_link, wrap_out_std,	nchoice_link2,	nw_syslink, 0,	2, SOC_FILE},
@@ -197,7 +199,9 @@
 	{__NR_unlink,	choice_link,	wrap_in_unlink, wrap_out_std,	nchoice_link,	nw_syspath_std, 0,	1, SOC_FILE},
 	{__NR_statfs,	choice_path,	wrap_in_statfs, wrap_out_std,	nchoice_path,	nw_syspath_std, 0,	2, SOC_FILE},
 	{__NR_fstatfs,	choice_fd,	wrap_in_fstatfs, wrap_out_std,	nchoice_fd,	nw_sysfd_std, 0,	2, SOC_FILE},
+#if (__NR_statfs64 != __NR_doesnotexist)
 	{__NR_statfs64,	choice_path,	wrap_in_statfs64, wrap_out_std,	nchoice_path,	nw_sysstatfs64, 0,	3, SOC_FILE},
+#endif
 	{__NR_fstatfs64,choice_fd,	wrap_in_fstat64, wrap_out_std,	nchoice_fd,	nw_sysfstatfs64, 0,	3, SOC_FILE},
 	{__NR_utime,	choice_path,	wrap_in_utime, wrap_out_std,	nchoice_path,	nw_syspath_std, 0,	2, SOC_FILE|SOC_TIME},
 	{__NR_utimes,	choice_path,	wrap_in_utime, wrap_out_std,	nchoice_path,	nw_syspath_std, 0,	2, SOC_FILE|SOC_TIME},
only in patch2:
unchanged:
--- umview-0.4a.orig/um-viewos/defs_x86_64.h
+++ umview-0.4a/um-viewos/defs_x86_64.h
@@ -224,13 +224,14 @@
 #undef __NR_fchown32
 #define __NR_fchown32 __NR_doesnotexist
 #define __NR_fcntl64 __NR_doesnotexist
-#define __NR__llseek __NR_doesnotexist
+/* #define __NR__llseek __NR_doesnotexist */
 #define __NR_truncate64 __NR_doesnotexist
 #define __NR_ftruncate64 __NR_doesnotexist
 #define __NR_send __NR_doesnotexist
 #define __NR_recv __NR_doesnotexist
 #define __NR_statfs64 __NR_doesnotexist
 #define __NR_fstatfs64 __NR_doesnotexist
+#define __NR_mmap2 __NR_doesnotexist
 
 #define wrap_in_stat wrap_in_stat64
 #define wrap_in_fstat wrap_in_fstat64
only in patch2:
unchanged:
--- umview-0.4a.orig/um_viewfs/viewfs.c
+++ umview-0.4a/um_viewfs/viewfs.c
@@ -40,8 +40,8 @@
 #include <sys/uio.h>
 #include <config.h>
 
-#include "module.h"
 #include "libummod.h"
+#include "module.h"
 #include "gdebug.h"
 
 // #define VIEWFS_ENABLE_REMAP