diff options
Diffstat (limited to 'package/util-linux/patches/100-llseek.patch')
| -rw-r--r-- | package/util-linux/patches/100-llseek.patch | 79 |
1 files changed, 37 insertions, 42 deletions
diff --git a/package/util-linux/patches/100-llseek.patch b/package/util-linux/patches/100-llseek.patch index 51bd09d6e..265aa182c 100644 --- a/package/util-linux/patches/100-llseek.patch +++ b/package/util-linux/patches/100-llseek.patch @@ -1,7 +1,8 @@ -diff -ur util-linux.old/fdisk/llseek.c util-linux.dev/fdisk/llseek.c ---- util-linux.old/fdisk/llseek.c 2003-07-13 23:13:33.000000000 +0200 -+++ util-linux.dev/fdisk/llseek.c 2006-12-14 23:06:12.000000000 +0100 -@@ -29,13 +29,7 @@ +Index: util-linux-2.12r/fdisk/llseek.c +=================================================================== +--- util-linux-2.12r.orig/fdisk/llseek.c 2007-06-04 13:22:28.258559328 +0200 ++++ util-linux-2.12r/fdisk/llseek.c 2007-06-04 13:22:28.339547016 +0200 +@@ -29,16 +29,10 @@ static int _llseek (unsigned int, unsigned long, unsigned long, long long *, unsigned int); @@ -15,49 +16,12 @@ diff -ur util-linux.old/fdisk/llseek.c util-linux.dev/fdisk/llseek.c +#ifndef __NR__llseek /* no __NR__llseek on compilation machine - might give it explicitly */ - static int _llseek (unsigned int fd, unsigned long oh, -diff -ur util-linux.old/fdisk/sfdisk.c util-linux.dev/fdisk/sfdisk.c ---- util-linux.old/fdisk/sfdisk.c 2005-01-04 23:31:57.000000000 +0100 -+++ util-linux.dev/fdisk/sfdisk.c 2006-12-14 23:05:41.000000000 +0100 -@@ -176,12 +176,6 @@ - #define use_lseek - #endif - --#ifndef use_lseek --static __attribute__used --_syscall5(int, _llseek, unsigned int, fd, ulong, hi, ulong, lo, -- loff_t *, res, unsigned int, wh); --#endif -- - static int - sseek(char *dev, unsigned int fd, unsigned long s) { - loff_t in, out; -diff -ur util-linux.old/partx/partx.c util-linux.dev/partx/partx.c ---- util-linux.old/partx/partx.c 2004-08-23 22:13:27.000000000 +0200 -+++ util-linux.dev/partx/partx.c 2006-12-14 23:06:42.000000000 +0100 -@@ -339,9 +339,6 @@ - - #ifdef NEED__llseek - #include <linux/unistd.h> /* _syscall */ --static --_syscall5(int, _llseek, uint, fd, ulong, hi, ulong, lo, -- long long *, res, uint, wh); - #endif - - static int -diff -ur util-linux.old/fdisk/llseek.c util-linux.dev/fdisk/llseek.c ---- util-linux.old/fdisk/llseek.c 2007-01-20 15:53:17.870636000 +0100 -+++ util-linux.dev/fdisk/llseek.c 2007-01-20 15:55:33.458024160 +0100 -@@ -32,7 +32,7 @@ - #ifndef __NR__llseek - - /* no __NR__llseek on compilation machine - might give it explicitly */ -static int _llseek (unsigned int fd, unsigned long oh, +static int __llseek (unsigned int fd, unsigned long oh, unsigned long ol, long long *result, unsigned int origin) { errno = ENOSYS; -@@ -41,17 +41,8 @@ +@@ -47,17 +41,8 @@ #endif @@ -77,3 +41,34 @@ diff -ur util-linux.old/fdisk/llseek.c util-linux.dev/fdisk/llseek.c #endif /* __alpha__ */ +Index: util-linux-2.12r/fdisk/sfdisk.c +=================================================================== +--- util-linux-2.12r.orig/fdisk/sfdisk.c 2007-06-04 13:22:28.265558264 +0200 ++++ util-linux-2.12r/fdisk/sfdisk.c 2007-06-04 13:22:28.338547168 +0200 +@@ -176,12 +176,6 @@ + #define use_lseek + #endif + +-#ifndef use_lseek +-static __attribute__used +-_syscall5(int, _llseek, unsigned int, fd, ulong, hi, ulong, lo, +- loff_t *, res, unsigned int, wh); +-#endif +- + static int + sseek(char *dev, unsigned int fd, unsigned long s) { + loff_t in, out; +Index: util-linux-2.12r/partx/partx.c +=================================================================== +--- util-linux-2.12r.orig/partx/partx.c 2007-06-04 13:22:28.272557200 +0200 ++++ util-linux-2.12r/partx/partx.c 2007-06-04 13:22:28.339547016 +0200 +@@ -339,9 +339,6 @@ + + #ifdef NEED__llseek + #include <linux/unistd.h> /* _syscall */ +-static +-_syscall5(int, _llseek, uint, fd, ulong, hi, ulong, lo, +- long long *, res, uint, wh); + #endif + + static int |