util-linux.patch 1.9 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859
  1. --- util-linux-2.11z/mount/fstab.c.orig 2003-12-03 15:28:22.000000000 -0700
  2. +++ util-linux-2.11z/mount/fstab.c 2003-12-03 15:28:41.000000000 -0700
  3. @@ -342,7 +342,7 @@
  4. /* Ensure that the lock is released if we are interrupted. */
  5. static void
  6. handler (int sig) {
  7. - die (EX_USER, "%s", sys_siglist[sig]);
  8. + die (EX_USER, "%s", strsignal(sig));
  9. }
  10. static void
  11. --- /dev/null 2003-09-07 01:55:59.000000000 -0600
  12. +++ util-linux-2.11z/mount/swapargs.h 2003-12-03 15:44:50.000000000 -0700
  13. @@ -0,0 +1,3 @@
  14. +#define SWAPON_HAS_TWO_ARGS
  15. +#include <asm/page.h>
  16. +#include <sys/swap.h>
  17. --- util-linux-2.11z/mount/swap.configure.orig 2003-12-03 15:43:24.000000000 -0700
  18. +++ util-linux-2.11z/mount/swap.configure 2003-12-03 15:45:33.000000000 -0700
  19. @@ -1,6 +1,8 @@
  20. # Find out whether we can include <sys/swap.h>
  21. # and whether libc thinks that swapon() has two arguments.
  22. +exit 0
  23. +
  24. # Prepare test
  25. CC=${CC-cc}
  26. compile="$CC -o conftest conftest.c >/dev/null 2>&1"
  27. --- util-linux-2.12/fdisk/sfdisk.c.orig 2005-01-11 16:46:36.000000000 -0700
  28. +++ util-linux-2.12/fdisk/sfdisk.c 2005-01-11 16:47:14.000000000 -0700
  29. @@ -47,7 +47,7 @@
  30. #include <sys/stat.h>
  31. #include <sys/utsname.h>
  32. #ifdef __linux__
  33. -#include <linux/unistd.h> /* _syscall */
  34. +#include <sys/syscall.h> /* _syscall */
  35. #endif
  36. #include "nls.h"
  37. #include "common.h"
  38. --- util-linux-2.12/fdisk/llseek.c.orig 2005-01-11 17:05:55.000000000 -0700
  39. +++ util-linux-2.12/fdisk/llseek.c 2005-01-11 17:07:11.000000000 -0700
  40. @@ -24,7 +24,7 @@
  41. #define my_llseek lseek
  42. #else
  43. -#include <linux/unistd.h> /* for __NR__llseek */
  44. +#include <sys/syscall.h> /* for __NR__llseek */
  45. static int _llseek (unsigned int, unsigned long,
  46. unsigned long, long long *, unsigned int);
  47. @@ -33,7 +33,7 @@
  48. static _syscall5(int,_llseek,unsigned int,fd,unsigned long,offset_high,
  49. unsigned long, offset_low,long long *,result,
  50. - unsigned int, origin)
  51. + unsigned int, origin);
  52. #else