r5611 - in glibc-package/trunk/debian: . patches patches/any patches/kfreebsd
Author: aurel32
Date: 2013-05-31 17:29:13 +0000 (Fri, 31 May 2013)
New Revision: 5611
Removed:
glibc-package/trunk/debian/patches/any/local-o_cloexec.diff
glibc-package/trunk/debian/patches/any/unsubmitted-cloexec-conditional.diff
glibc-package/trunk/debian/patches/kfreebsd/local-freopen.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* Remove any/local-o_cloexec.diff, kfreebsd/local-freopen.diff and
any/unsubmitted-cloexec-conditional.diff (not needed anymore).
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2013-05-31 15:38:17 UTC (rev 5610)
+++ glibc-package/trunk/debian/changelog 2013-05-31 17:29:13 UTC (rev 5611)
@@ -10,6 +10,10 @@
* debian/sysdeps/kfreebsd.mk, debian/debhelper.in/libc.preinst:
bump minimal FreeBSD kernel version to 8.3.
+ [ Aurelien Jarno ]
+ * Remove any/local-o_cloexec.diff, kfreebsd/local-freopen.diff and
+ any/unsubmitted-cloexec-conditional.diff (not needed anymore).
+
-- Adam Conrad <adconrad@0c3.net> Thu, 16 May 2013 16:09:55 -0600
eglibc (2.17-3) unstable; urgency=medium
Deleted: glibc-package/trunk/debian/patches/any/local-o_cloexec.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-o_cloexec.diff 2013-05-31 15:38:17 UTC (rev 5610)
+++ glibc-package/trunk/debian/patches/any/local-o_cloexec.diff 2013-05-31 17:29:13 UTC (rev 5611)
@@ -1,22 +0,0 @@
----
- sysdeps/posix/opendir.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/sysdeps/posix/opendir.c
-+++ b/sysdeps/posix/opendir.c
-@@ -160,6 +160,7 @@
- #ifdef __ASSUME_O_CLOEXEC
- # define check_have_o_cloexec(fd) 1
- #else
-+#ifdef O_CLOEXEC
- static int
- check_have_o_cloexec (int fd)
- {
-@@ -168,6 +169,7 @@
- return __have_o_cloexec > 0;
- }
- #endif
-+#endif
-
-
- DIR *
Deleted: glibc-package/trunk/debian/patches/any/unsubmitted-cloexec-conditional.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/unsubmitted-cloexec-conditional.diff 2013-05-31 15:38:17 UTC (rev 5610)
+++ glibc-package/trunk/debian/patches/any/unsubmitted-cloexec-conditional.diff 2013-05-31 17:29:13 UTC (rev 5611)
@@ -1,117 +0,0 @@
-diff --git a/elf/dl-load.c b/elf/dl-load.c
-index dd182c9..7ebb6ff 100644
---- a/elf/dl-load.c
-+++ b/elf/dl-load.c
-@@ -1721,7 +1721,11 @@ open_verify (const char *name, struct filebuf *fbp, struct link_map *loader,
- #endif
-
- /* Open the file. We always open files read-only. */
-- int fd = __open (name, O_RDONLY | O_CLOEXEC);
-+ int oflags = O_RDONLY;
-+#ifdef O_CLOEXEC
-+ oflags |= O_CLOEXEC;
-+#endif
-+ int fd = __open (name, oflags);
- if (fd != -1)
- {
- ElfW(Ehdr) *ehdr;
-diff --git a/libio/fileops.c b/libio/fileops.c
-index 61b61b3..80767f5 100644
---- a/libio/fileops.c
-+++ b/libio/fileops.c
-@@ -335,16 +335,24 @@ _IO_new_file_fopen (fp, filename, mode, is32not64)
- if (result != NULL)
- {
- #ifndef __ASSUME_O_CLOEXEC
-- if ((fp->_flags2 & _IO_FLAGS2_CLOEXEC) != 0 && __have_o_cloexec <= 0)
-- {
-- int fd = _IO_fileno (fp);
-- if (__have_o_cloexec == 0)
-+# ifdef O_CLOEXEC
-+ if (__have_o_cloexec <= 0)
-+# endif
-+ {
-+ if ((fp->_flags2 & _IO_FLAGS2_CLOEXEC) != 0)
- {
-+ int fd = _IO_fileno (fp);
- int flags = __fcntl (fd, F_GETFD);
-- __have_o_cloexec = (flags & FD_CLOEXEC) == 0 ? -1 : 1;
-+# ifdef O_CLOEXEC
-+ if (__have_o_cloexec == 0)
-+ __have_o_cloexec = (flags & FD_CLOEXEC) == 0 ? -1 : 1;
-+ if (__have_o_cloexec < 0)
-+# endif
-+ {
-+ flags |= FD_CLOEXEC;
-+ __fcntl (fd, F_SETFD, flags);
-+ }
- }
-- if (__have_o_cloexec < 0)
-- __fcntl (fd, F_SETFD, FD_CLOEXEC);
- }
- #endif
-
-diff --git a/locale/loadarchive.c b/locale/loadarchive.c
-index dd70c15..4edb03e 100644
---- a/locale/loadarchive.c
-+++ b/locale/loadarchive.c
-@@ -152,6 +152,10 @@ _nl_load_locale_from_archive (int category, const char **namep)
- int cnt;
- size_t ps = __sysconf (_SC_PAGE_SIZE);
- int fd = -1;
-+ int oflags = O_RDONLY | O_LARGEFILE;
-+#ifdef O_CLOEXEC
-+ oflags |= O_CLOEXEC;
-+#endif
-
- /* Check if we have already loaded this locale from the archive.
- If we previously loaded the locale but found bogons in the data,
-@@ -202,7 +206,7 @@ _nl_load_locale_from_archive (int category, const char **namep)
- archmapped = &headmap;
-
- /* The archive has never been opened. */
-- fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE|O_CLOEXEC);
-+ fd = open_not_cancel_2 (archfname, oflags);
- if (fd < 0)
- /* Cannot open the archive, for whatever reason. */
- return NULL;
-@@ -393,8 +397,7 @@ _nl_load_locale_from_archive (int category, const char **namep)
- if (fd == -1)
- {
- struct stat64 st;
-- fd = open_not_cancel_2 (archfname,
-- O_RDONLY|O_LARGEFILE|O_CLOEXEC);
-+ fd = open_not_cancel_2 (archfname, oflags);
- if (fd == -1)
- /* Cannot open the archive, for whatever reason. */
- return NULL;
-diff --git a/locale/loadlocale.c b/locale/loadlocale.c
-index de7e3d0..ec5de7c 100644
---- a/locale/loadlocale.c
-+++ b/locale/loadlocale.c
-@@ -168,11 +168,15 @@ _nl_load_locale (struct loaded_l10nfile *file, int category)
- struct __locale_data *newdata;
- int save_err;
- int alloc = ld_mapped;
-+ int oflags = O_RDONLY;
-+#ifdef O_CLOEXEC
-+ oflags |= O_CLOEXEC;
-+#endif
-
- file->decided = 1;
- file->data = NULL;
-
-- fd = open_not_cancel_2 (file->filename, O_RDONLY | O_CLOEXEC);
-+ fd = open_not_cancel_2 (file->filename, oflags);
- if (__builtin_expect (fd, 0) < 0)
- /* Cannot open the file. */
- return;
-@@ -200,7 +204,7 @@ _nl_load_locale (struct loaded_l10nfile *file, int category)
- _nl_category_names.str + _nl_category_name_idxs[category],
- _nl_category_name_sizes[category] + 1);
-
-- fd = open_not_cancel_2 (newp, O_RDONLY | O_CLOEXEC);
-+ fd = open_not_cancel_2 (newp, oflags);
- if (__builtin_expect (fd, 0) < 0)
- return;
-
Deleted: glibc-package/trunk/debian/patches/kfreebsd/local-freopen.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-freopen.diff 2013-05-31 15:38:17 UTC (rev 5610)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-freopen.diff 2013-05-31 17:29:13 UTC (rev 5611)
@@ -1,46 +0,0 @@
-Index: eglibc-2.17/libio/freopen.c
-===================================================================
---- eglibc-2.17.orig/libio/freopen.c
-+++ eglibc-2.17/libio/freopen.c
-@@ -93,15 +93,16 @@
- (result->_flags2 & _IO_FLAGS2_CLOEXEC) != 0
- ? O_CLOEXEC : 0);
- #else
--# define newfd 1
-+# define newfd -1
- #endif
-
- #ifndef __ASSUME_DUP3
- if (newfd < 0)
- {
-+# ifdef O_CLOEXEC
- if (errno == ENOSYS)
- __have_dup3 = -1;
--
-+# endif
- __dup2 (_IO_fileno (result), fd);
- if ((result->_flags2 & _IO_FLAGS2_CLOEXEC) != 0)
- __fcntl (fd, F_SETFD, FD_CLOEXEC);
-Index: eglibc-2.17/libio/freopen64.c
-===================================================================
---- eglibc-2.17.orig/libio/freopen64.c
-+++ eglibc-2.17/libio/freopen64.c
-@@ -76,15 +76,16 @@
- (result->_flags2 & _IO_FLAGS2_CLOEXEC) != 0
- ? O_CLOEXEC : 0);
- #else
--# define newfd 1
-+# define newfd -1
- #endif
-
- #ifndef __ASSUME_DUP3
- if (newfd < 0)
- {
-+# ifdef O_CLOEXEC
- if (errno == ENOSYS)
- __have_dup3 = -1;
--
-+# endif
- __dup2 (_IO_fileno (result), fd);
- if ((result->_flags2 & _IO_FLAGS2_CLOEXEC) != 0)
- __fcntl (fd, F_SETFD, FD_CLOEXEC);
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2013-05-31 15:38:17 UTC (rev 5610)
+++ glibc-package/trunk/debian/patches/series 2013-05-31 17:29:13 UTC (rev 5611)
@@ -142,7 +142,6 @@
kfreebsd/local-sysdeps.diff
kfreebsd/local-scripts.diff
kfreebsd/local-getaddrinfo-freebsd-kernel.diff
-kfreebsd/local-freopen.diff
m68k/local-dwarf2-buildfix.diff
m68k/local-fpic.diff
@@ -200,7 +199,6 @@
any/local-mktemp.diff
any/local-no-pagesize.diff
any/local-nss-upgrade.diff
-any/local-o_cloexec.diff
any/local-rtld.diff
any/local-stubs_h.diff
any/local-stdio-lock.diff
@@ -231,7 +229,6 @@
any/local-revert-bz13979.diff
any/local-tst-eintr1-eagain.diff
any/cvs-tst-array-as-needed.diff
-any/unsubmitted-cloexec-conditional.diff
any/unsubmitted-ldso-machine-mismatch.diff
any/cvs-use-glibc-wchar.diff
any/submitted-setfsid-wur.diff
Reply to: