diff -u eglibc-2.15/debian/changelog eglibc-2.15/debian/changelog --- eglibc-2.15/debian/changelog +++ eglibc-2.15/debian/changelog @@ -1,3 +1,10 @@ +eglibc (2.15-0ubuntu14) quantal; urgency=low + + * fix debian/patches/any/submitted-bits-fcntl_h-at.diff to not lose the + definition of AT_EMPTY_PATH. (LP: #1010069) + + -- Serge Hallyn Thu, 07 Jun 2012 15:40:02 +0000 + eglibc (2.15-0ubuntu13) quantal; urgency=low * arm/local-linaro-cortex-strings.diff: instead of sysdeps/arm, apply diff -u eglibc-2.15/debian/patches/any/submitted-bits-fcntl_h-at.diff eglibc-2.15/debian/patches/any/submitted-bits-fcntl_h-at.diff --- eglibc-2.15/debian/patches/any/submitted-bits-fcntl_h-at.diff +++ eglibc-2.15/debian/patches/any/submitted-bits-fcntl_h-at.diff @@ -46,8 +46,10 @@ sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h | 15 +++++++++++++++ 16 files changed, 227 insertions(+), 14 deletions(-) ---- a/io/fcntl.h -+++ b/io/fcntl.h +Index: eglibc-2.15/io/fcntl.h +=================================================================== +--- eglibc-2.15.orig/io/fcntl.h 2011-04-01 19:43:08.000000000 +0000 ++++ eglibc-2.15/io/fcntl.h 2012-06-07 14:41:49.011057001 +0000 @@ -102,21 +102,6 @@ # define SEEK_END 2 /* Seek from end of file. */ #endif /* XPG */ @@ -70,9 +72,10 @@ /* Do the file control operation described by CMD on FD. The remaining arguments are interpreted depending on CMD. - ---- a/sysdeps/mach/hurd/bits/fcntl.h -+++ b/sysdeps/mach/hurd/bits/fcntl.h +Index: eglibc-2.15/sysdeps/mach/hurd/bits/fcntl.h +=================================================================== +--- eglibc-2.15.orig/sysdeps/mach/hurd/bits/fcntl.h 2008-08-19 17:24:09.000000000 +0000 ++++ eglibc-2.15/sysdeps/mach/hurd/bits/fcntl.h 2012-06-07 14:41:49.011057001 +0000 @@ -219,3 +219,18 @@ # define POSIX_FADV_DONTNEED 4 /* Don't need these pages. */ # define POSIX_FADV_NOREUSE 5 /* Data will be accessed once. */ @@ -92,10 +95,12 @@ +# define AT_EACCESS 0x200 /* Test access permitted for + effective IDs, not real IDs. */ +#endif ---- a/sysdeps/unix/sysv/linux/i386/bits/fcntl.h -+++ b/sysdeps/unix/sysv/linux/i386/bits/fcntl.h -@@ -234,6 +234,21 @@ - # define SPLICE_F_GIFT 8 /* Pages passed in are a gift. */ +Index: eglibc-2.15/sysdeps/unix/sysv/linux/i386/bits/fcntl.h +=================================================================== +--- eglibc-2.15.orig/sysdeps/unix/sysv/linux/i386/bits/fcntl.h 2011-04-01 19:43:08.000000000 +0000 ++++ eglibc-2.15/sysdeps/unix/sysv/linux/i386/bits/fcntl.h 2012-06-07 15:35:01.215054333 +0000 +@@ -248,6 +248,22 @@ + # define MAX_HANDLE_SZ 128 #endif +/* Values for `*at' functions. */ @@ -109,6 +114,7 @@ +# define AT_SYMLINK_FOLLOW 0x400 /* Follow symbolic links. */ +# define AT_NO_AUTOMOUNT 0x800 /* Suppress terminal automount + traversal. */ ++# define AT_EMPTY_PATH 0x1000 /* Allow empty relative pathname. */ +# define AT_EACCESS 0x200 /* Test access permitted for + effective IDs, not real IDs. */ +#endif @@ -116,10 +122,12 @@ __BEGIN_DECLS #ifdef __USE_GNU ---- a/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h -+++ b/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h -@@ -229,6 +229,21 @@ - # define SPLICE_F_GIFT 8 /* Pages passed in are a gift. */ +Index: eglibc-2.15/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h +=================================================================== +--- eglibc-2.15.orig/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h 2011-04-01 19:43:08.000000000 +0000 ++++ eglibc-2.15/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h 2012-06-07 15:35:28.143055537 +0000 +@@ -243,6 +243,22 @@ + # define MAX_HANDLE_SZ 128 #endif +/* Values for `*at' functions. */ @@ -133,6 +141,7 @@ +# define AT_SYMLINK_FOLLOW 0x400 /* Follow symbolic links. */ +# define AT_NO_AUTOMOUNT 0x800 /* Suppress terminal automount + traversal. */ ++# define AT_EMPTY_PATH 0x1000 /* Allow empty relative pathname. */ +# define AT_EACCESS 0x200 /* Test access permitted for + effective IDs, not real IDs. */ +#endif @@ -140,9 +149,11 @@ __BEGIN_DECLS #ifdef __USE_GNU ---- a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h -+++ b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h -@@ -234,6 +234,21 @@ +Index: eglibc-2.15/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h +=================================================================== +--- eglibc-2.15.orig/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h 2011-04-01 19:43:08.000000000 +0000 ++++ eglibc-2.15/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h 2012-06-07 15:35:50.243057339 +0000 +@@ -235,6 +235,22 @@ # define SPLICE_F_GIFT 8 /* Pages passed in are a gift. */ #endif @@ -157,6 +168,7 @@ +# define AT_SYMLINK_FOLLOW 0x400 /* Follow symbolic links. */ +# define AT_NO_AUTOMOUNT 0x800 /* Suppress terminal automount + traversal. */ ++# define AT_EMPTY_PATH 0x1000 /* Allow empty relative pathname. */ +# define AT_EACCESS 0x200 /* Test access permitted for + effective IDs, not real IDs. */ +#endif @@ -164,10 +176,12 @@ __BEGIN_DECLS #ifdef __USE_GNU ---- a/sysdeps/unix/sysv/linux/s390/bits/fcntl.h -+++ b/sysdeps/unix/sysv/linux/s390/bits/fcntl.h -@@ -255,6 +255,21 @@ - # define SPLICE_F_GIFT 8 /* Pages passed in are a gift. */ +Index: eglibc-2.15/sysdeps/unix/sysv/linux/s390/bits/fcntl.h +=================================================================== +--- eglibc-2.15.orig/sysdeps/unix/sysv/linux/s390/bits/fcntl.h 2011-04-01 19:43:08.000000000 +0000 ++++ eglibc-2.15/sysdeps/unix/sysv/linux/s390/bits/fcntl.h 2012-06-07 15:36:18.287053181 +0000 +@@ -269,6 +269,22 @@ + # define MAX_HANDLE_SZ 128 #endif +/* Values for `*at' functions. */ @@ -181,6 +195,7 @@ +# define AT_SYMLINK_FOLLOW 0x400 /* Follow symbolic links. */ +# define AT_NO_AUTOMOUNT 0x800 /* Suppress terminal automount + traversal. */ ++# define AT_EMPTY_PATH 0x1000 /* Allow empty relative pathname. */ +# define AT_EACCESS 0x200 /* Test access permitted for + effective IDs, not real IDs. */ +#endif @@ -188,10 +203,12 @@ __BEGIN_DECLS #ifdef __USE_GNU ---- a/sysdeps/unix/sysv/linux/sh/bits/fcntl.h -+++ b/sysdeps/unix/sysv/linux/sh/bits/fcntl.h -@@ -235,6 +235,21 @@ - # define SPLICE_F_GIFT 8 /* Pages passed in are a gift. */ +Index: eglibc-2.15/sysdeps/unix/sysv/linux/sh/bits/fcntl.h +=================================================================== +--- eglibc-2.15.orig/sysdeps/unix/sysv/linux/sh/bits/fcntl.h 2011-04-01 19:43:08.000000000 +0000 ++++ eglibc-2.15/sysdeps/unix/sysv/linux/sh/bits/fcntl.h 2012-06-07 15:36:36.675059459 +0000 +@@ -249,6 +249,22 @@ + # define MAX_HANDLE_SZ 128 #endif +/* Values for `*at' functions. */ @@ -205,6 +222,7 @@ +# define AT_SYMLINK_FOLLOW 0x400 /* Follow symbolic links. */ +# define AT_NO_AUTOMOUNT 0x800 /* Suppress terminal automount + traversal. */ ++# define AT_EMPTY_PATH 0x1000 /* Allow empty relative pathname. */ +# define AT_EACCESS 0x200 /* Test access permitted for + effective IDs, not real IDs. */ +#endif @@ -212,10 +230,12 @@ __BEGIN_DECLS #ifdef __USE_GNU ---- a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h -+++ b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h -@@ -245,6 +245,21 @@ - # define SPLICE_F_GIFT 8 /* Pages passed in are a gift. */ +Index: eglibc-2.15/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h +=================================================================== +--- eglibc-2.15.orig/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h 2011-04-01 19:43:08.000000000 +0000 ++++ eglibc-2.15/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h 2012-06-07 15:36:53.195058572 +0000 +@@ -259,6 +259,22 @@ + # define MAX_HANDLE_SZ 128 #endif +/* Values for `*at' functions. */ @@ -229,6 +249,7 @@ +# define AT_SYMLINK_FOLLOW 0x400 /* Follow symbolic links. */ +# define AT_NO_AUTOMOUNT 0x800 /* Suppress terminal automount + traversal. */ ++# define AT_EMPTY_PATH 0x1000 /* Allow empty relative pathname. */ +# define AT_EACCESS 0x200 /* Test access permitted for + effective IDs, not real IDs. */ +#endif @@ -236,10 +257,12 @@ __BEGIN_DECLS #ifdef __USE_GNU ---- a/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h -+++ b/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h -@@ -249,6 +249,21 @@ - # define SPLICE_F_GIFT 8 /* Pages passed in are a gift. */ +Index: eglibc-2.15/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h +=================================================================== +--- eglibc-2.15.orig/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h 2011-04-01 19:43:08.000000000 +0000 ++++ eglibc-2.15/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h 2012-06-07 15:37:08.439055172 +0000 +@@ -263,6 +263,22 @@ + # define MAX_HANDLE_SZ 128 #endif +/* Values for `*at' functions. */ @@ -253,6 +276,7 @@ +# define AT_SYMLINK_FOLLOW 0x400 /* Follow symbolic links. */ +# define AT_NO_AUTOMOUNT 0x800 /* Suppress terminal automount + traversal. */ ++# define AT_EMPTY_PATH 0x1000 /* Allow empty relative pathname. */ +# define AT_EACCESS 0x200 /* Test access permitted for + effective IDs, not real IDs. */ +#endif @@ -260,9 +284,11 @@ __BEGIN_DECLS #ifdef __USE_GNU ---- a/ports/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h -+++ b/ports/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h -@@ -223,6 +223,21 @@ +Index: eglibc-2.15/ports/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h +=================================================================== +--- eglibc-2.15.orig/ports/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h 2011-03-05 19:39:34.000000000 +0000 ++++ eglibc-2.15/ports/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h 2012-06-07 15:37:46.951057010 +0000 +@@ -225,6 +225,22 @@ # define SPLICE_F_GIFT 8 /* Pages passed in are a gift. */ #endif @@ -277,6 +303,7 @@ +# define AT_SYMLINK_FOLLOW 0x400 /* Follow symbolic links. */ +# define AT_NO_AUTOMOUNT 0x800 /* Suppress terminal automount + traversal. */ ++# define AT_EMPTY_PATH 0x1000 /* Allow empty relative pathname. */ +# define AT_EACCESS 0x200 /* Test access permitted for + effective IDs, not real IDs. */ +#endif @@ -284,9 +311,11 @@ __BEGIN_DECLS #ifdef __USE_GNU ---- a/ports/sysdeps/unix/sysv/linux/am33/bits/fcntl.h -+++ b/ports/sysdeps/unix/sysv/linux/am33/bits/fcntl.h -@@ -179,3 +179,20 @@ +Index: eglibc-2.15/ports/sysdeps/unix/sysv/linux/am33/bits/fcntl.h +=================================================================== +--- eglibc-2.15.orig/ports/sysdeps/unix/sysv/linux/am33/bits/fcntl.h 2007-10-22 15:56:53.000000000 +0000 ++++ eglibc-2.15/ports/sysdeps/unix/sysv/linux/am33/bits/fcntl.h 2012-06-07 15:38:01.503053919 +0000 +@@ -179,3 +179,21 @@ # define POSIX_FADV_DONTNEED 4 /* Don't need these pages. */ # define POSIX_FADV_NOREUSE 5 /* Data will be accessed once. */ #endif @@ -302,15 +331,18 @@ +# define AT_SYMLINK_FOLLOW 0x400 /* Follow symbolic links. */ +# define AT_NO_AUTOMOUNT 0x800 /* Suppress terminal automount + traversal. */ ++# define AT_EMPTY_PATH 0x1000 /* Allow empty relative pathname. */ +# define AT_EACCESS 0x200 /* Test access permitted for + effective IDs, not real IDs. */ +#endif + + ---- a/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h -+++ b/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h -@@ -234,6 +234,21 @@ - # define SPLICE_F_GIFT 8 /* Pages passed in are a gift. */ +Index: eglibc-2.15/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h +=================================================================== +--- eglibc-2.15.orig/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h 2011-04-01 19:43:08.000000000 +0000 ++++ eglibc-2.15/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h 2012-06-07 15:38:24.435056901 +0000 +@@ -248,6 +248,22 @@ + # define MAX_HANDLE_SZ 128 #endif +/* Values for `*at' functions. */ @@ -324,6 +356,7 @@ +# define AT_SYMLINK_FOLLOW 0x400 /* Follow symbolic links. */ +# define AT_NO_AUTOMOUNT 0x800 /* Suppress terminal automount + traversal. */ ++# define AT_EMPTY_PATH 0x1000 /* Allow empty relative pathname. */ +# define AT_EACCESS 0x200 /* Test access permitted for + effective IDs, not real IDs. */ +#endif @@ -331,9 +364,11 @@ __BEGIN_DECLS #ifdef __USE_GNU ---- a/ports/sysdeps/unix/sysv/linux/cris/bits/fcntl.h -+++ b/ports/sysdeps/unix/sysv/linux/cris/bits/fcntl.h -@@ -182,6 +182,21 @@ +Index: eglibc-2.15/ports/sysdeps/unix/sysv/linux/cris/bits/fcntl.h +=================================================================== +--- eglibc-2.15.orig/ports/sysdeps/unix/sysv/linux/cris/bits/fcntl.h 2007-10-22 15:56:53.000000000 +0000 ++++ eglibc-2.15/ports/sysdeps/unix/sysv/linux/cris/bits/fcntl.h 2012-06-07 15:38:47.707061122 +0000 +@@ -182,6 +182,22 @@ # define POSIX_FADV_NOREUSE 5 /* Data will be accessed once. */ #endif @@ -348,6 +383,7 @@ +# define AT_SYMLINK_FOLLOW 0x400 /* Follow symbolic links. */ +# define AT_NO_AUTOMOUNT 0x800 /* Suppress terminal automount + traversal. */ ++# define AT_EMPTY_PATH 0x1000 /* Allow empty relative pathname. */ +# define AT_EACCESS 0x200 /* Test access permitted for + effective IDs, not real IDs. */ +#endif @@ -355,10 +391,12 @@ __BEGIN_DECLS /* Provide kernel hint to read ahead. */ ---- a/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h -+++ b/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h -@@ -229,6 +229,21 @@ - # define SPLICE_F_GIFT 8 /* Pages passed in are a gift. */ +Index: eglibc-2.15/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h +=================================================================== +--- eglibc-2.15.orig/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h 2011-10-25 00:37:10.000000000 +0000 ++++ eglibc-2.15/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h 2012-06-07 15:39:10.871058140 +0000 +@@ -248,6 +248,22 @@ + # define MAX_HANDLE_SZ 128 #endif +/* Values for `*at' functions. */ @@ -372,6 +410,7 @@ +# define AT_SYMLINK_FOLLOW 0x400 /* Follow symbolic links. */ +# define AT_NO_AUTOMOUNT 0x800 /* Suppress terminal automount + traversal. */ ++# define AT_EMPTY_PATH 0x1000 /* Allow empty relative pathname. */ +# define AT_EACCESS 0x200 /* Test access permitted for + effective IDs, not real IDs. */ +#endif @@ -379,10 +418,12 @@ __BEGIN_DECLS #ifdef __USE_GNU ---- a/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h -+++ b/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h -@@ -233,6 +233,21 @@ - # define SPLICE_F_GIFT 8 /* Pages passed in are a gift. */ +Index: eglibc-2.15/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h +=================================================================== +--- eglibc-2.15.orig/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h 2011-05-05 11:06:02.000000000 +0000 ++++ eglibc-2.15/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h 2012-06-07 15:39:23.275058922 +0000 +@@ -247,6 +247,22 @@ + # define MAX_HANDLE_SZ 128 #endif +/* Values for `*at' functions. */ @@ -396,6 +437,7 @@ +# define AT_SYMLINK_FOLLOW 0x400 /* Follow symbolic links. */ +# define AT_NO_AUTOMOUNT 0x800 /* Suppress terminal automount + traversal. */ ++# define AT_EMPTY_PATH 0x1000 /* Allow empty relative pathname. */ +# define AT_EACCESS 0x200 /* Test access permitted for + effective IDs, not real IDs. */ +#endif @@ -403,10 +445,12 @@ __BEGIN_DECLS #ifdef __USE_GNU ---- a/ports/sysdeps/unix/sysv/linux/mips/bits/fcntl.h -+++ b/ports/sysdeps/unix/sysv/linux/mips/bits/fcntl.h -@@ -247,6 +247,21 @@ - # define SPLICE_F_GIFT 8 /* Pages passed in are a gift. */ +Index: eglibc-2.15/ports/sysdeps/unix/sysv/linux/mips/bits/fcntl.h +=================================================================== +--- eglibc-2.15.orig/ports/sysdeps/unix/sysv/linux/mips/bits/fcntl.h 2011-04-01 19:43:08.000000000 +0000 ++++ eglibc-2.15/ports/sysdeps/unix/sysv/linux/mips/bits/fcntl.h 2012-06-07 15:39:35.575058635 +0000 +@@ -261,6 +261,22 @@ + # define MAX_HANDLE_SZ 128 #endif +/* Values for `*at' functions. */ @@ -420,6 +464,7 @@ +# define AT_SYMLINK_FOLLOW 0x400 /* Follow symbolic links. */ +# define AT_NO_AUTOMOUNT 0x800 /* Suppress terminal automount + traversal. */ ++# define AT_EMPTY_PATH 0x1000 /* Allow empty relative pathname. */ +# define AT_EACCESS 0x200 /* Test access permitted for + effective IDs, not real IDs. */ +#endif