r4065 - in glibc-package/trunk/debian: . patches patches/any patches/kfreebsd
Author: ps-guest
Date: 2010-01-07 06:50:24 +0000 (Thu, 07 Jan 2010)
New Revision: 4065
Added:
glibc-package/trunk/debian/patches/any/local-no-SOCK_NONBLOCK.diff
Removed:
glibc-package/trunk/debian/patches/kfreebsd/local-no-SOCK_NONBLOCK.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
glibc-package/trunk/debian/patches/series.hurd-i386
glibc-package/trunk/debian/patches/series.kfreebsd-amd64
glibc-package/trunk/debian/patches/series.kfreebsd-i386
Log:
* Update kfreebsd/local-no-SOCK_NONBLOCK.diff to cvs-resolv-* changes.
Move it into any/local-no-SOCK_NONBLOCK.diff, as it is used also on hurd.
Closes: #564008.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2010-01-06 23:49:30 UTC (rev 4064)
+++ glibc-package/trunk/debian/changelog 2010-01-07 06:50:24 UTC (rev 4065)
@@ -1,3 +1,12 @@
+eglibc (2.10.2-5) UNSTABLE; urgency=low
+
+ [ Petr Salinger]
+ * Update kfreebsd/local-no-SOCK_NONBLOCK.diff to cvs-resolv-* changes.
+ Move it into any/local-no-SOCK_NONBLOCK.diff, as it is used also on hurd.
+ Closes: #564008.
+
+ -- Aurelien Jarno <aurel32@debian.org> Wed, 06 Jan 2010 22:18:19 +0100
+
eglibc (2.10.2-4) unstable; urgency=low
[ Samuel Thibault ]
Copied: glibc-package/trunk/debian/patches/any/local-no-SOCK_NONBLOCK.diff (from rev 4064, glibc-package/trunk/debian/patches/kfreebsd/local-no-SOCK_NONBLOCK.diff)
===================================================================
--- glibc-package/trunk/debian/patches/any/local-no-SOCK_NONBLOCK.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/local-no-SOCK_NONBLOCK.diff 2010-01-07 06:50:24 UTC (rev 4065)
@@ -0,0 +1,99 @@
+--- a/resolv/res_send.c
++++ b/resolv/res_send.c
+@@ -103,13 +103,13 @@
+ #define MAXPACKET 65536
+ #endif
+
+-
++#ifdef SOCK_NONBLOCK
+ #ifndef __ASSUME_SOCK_CLOEXEC
+ static int __have_o_nonblock;
+ #else
+ # define __have_o_nonblock 0
+ #endif
+-
++#endif
+
+ /* From ev_streams.c. */
+
+@@ -915,6 +915,7 @@
+
+ /* only try IPv6 if IPv6 NS and if not failed before */
+ if (nsap->sin6_family == AF_INET6 && !statp->ipv6_unavail) {
++#ifdef SOCK_NONBLOCK
+ if (__builtin_expect (__have_o_nonblock >= 0, 1)) {
+ EXT(statp).nssocks[ns] =
+ socket(PF_INET6, SOCK_DGRAM|SOCK_NONBLOCK,
+@@ -927,11 +928,13 @@
+ #endif
+ }
+ if (__builtin_expect (__have_o_nonblock < 0, 0))
++#endif
+ EXT(statp).nssocks[ns] =
+ socket(PF_INET6, SOCK_DGRAM, 0);
+ if (EXT(statp).nssocks[ns] < 0)
+ statp->ipv6_unavail = errno == EAFNOSUPPORT;
+ } else if (nsap->sin6_family == AF_INET) {
++#ifdef SOCK_NONBLOCK
+ if (__builtin_expect (__have_o_nonblock >= 0, 1)) {
+ EXT(statp).nssocks[ns]
+ = socket(PF_INET, SOCK_DGRAM|SOCK_NONBLOCK,
+@@ -944,6 +947,7 @@
+ #endif
+ }
+ if (__builtin_expect (__have_o_nonblock < 0, 0))
++#endif
+ EXT(statp).nssocks[ns]
+ = socket(PF_INET, SOCK_DGRAM, 0);
+ }
+@@ -971,7 +975,11 @@
+ __res_iclose(statp, false);
+ return (0);
+ }
++#ifdef SOCK_NONBLOCK
+ if (__builtin_expect (__have_o_nonblock < 0, 0)) {
++#else
++ {
++#endif
+ /* Make socket non-blocking. */
+ int fl = __fcntl (EXT(statp).nssocks[ns], F_GETFL);
+ if (fl != -1)
+--- a/nscd/connections.c
++++ b/nscd/connections.c
+@@ -1837,6 +1837,7 @@
+ /* We have a new incoming connection. Accept the connection. */
+ int fd;
+
++#ifdef SOCK_NONBLOCK
+ #ifndef __ASSUME_ACCEPT4
+ fd = -1;
+ if (have_accept4 >= 0)
+@@ -1853,6 +1854,9 @@
+ if (have_accept4 < 0)
+ fd = TEMP_FAILURE_RETRY (accept (sock, NULL, NULL));
+ #endif
++#else
++ fd = TEMP_FAILURE_RETRY (accept (sock, NULL, NULL));
++#endif
+
+ /* Use the descriptor if we have not reached the limit. */
+ if (fd >= 0)
+@@ -2042,7 +2046,7 @@
+ {
+ /* A new connection. */
+ int fd;
+-
++#ifdef SOCK_NONBLOCK
+ # ifndef __ASSUME_ACCEPT4
+ fd = -1;
+ if (have_accept4 >= 0)
+@@ -2059,6 +2063,9 @@
+ if (have_accept4 < 0)
+ fd = TEMP_FAILURE_RETRY (accept (sock, NULL, NULL));
+ # endif
++#else
++ fd = TEMP_FAILURE_RETRY (accept (sock, NULL, NULL));
++#endif
+
+ /* Use the descriptor if we have not reached the limit. */
+ if (fd >= 0)
Deleted: glibc-package/trunk/debian/patches/kfreebsd/local-no-SOCK_NONBLOCK.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-no-SOCK_NONBLOCK.diff 2010-01-06 23:49:30 UTC (rev 4064)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-no-SOCK_NONBLOCK.diff 2010-01-07 06:50:24 UTC (rev 4065)
@@ -1,85 +0,0 @@
---- a/resolv/res_send.c
-+++ b/resolv/res_send.c
-@@ -933,6 +933,7 @@
- if (EXT(statp).nssocks[ns] == -1) {
- /* only try IPv6 if IPv6 NS and if not failed before */
- if ((EXT(statp).nscount6 > 0) && !statp->ipv6_unavail) {
-+#ifdef SOCK_NONBLOCK
- if (__builtin_expect (__have_o_nonblock >= 0, 1)) {
- EXT(statp).nssocks[ns] =
- socket(PF_INET6, SOCK_DGRAM|SOCK_NONBLOCK,
-@@ -945,6 +946,7 @@
- #endif
- }
- if (__builtin_expect (__have_o_nonblock < 0, 0))
-+#endif
- EXT(statp).nssocks[ns] =
- socket(PF_INET6, SOCK_DGRAM, 0);
- if (EXT(statp).nssocks[ns] < 0)
-@@ -955,6 +957,7 @@
- convaddr4to6(nsap);
- }
- if (EXT(statp).nssocks[ns] < 0) {
-+#ifdef SOCK_NONBLOCK
- if (__builtin_expect (__have_o_nonblock >= 0, 1)) {
- EXT(statp).nssocks[ns]
- = socket(PF_INET, SOCK_DGRAM|SOCK_NONBLOCK,
-@@ -967,6 +970,7 @@
- #endif
- }
- if (__builtin_expect (__have_o_nonblock < 0, 0))
-+#endif
- EXT(statp).nssocks[ns]
- = socket(PF_INET, SOCK_DGRAM, 0);
- }
-@@ -994,7 +998,11 @@
- __res_iclose(statp, false);
- return (0);
- }
-+#ifdef SOCK_NONBLOCK
- if (__builtin_expect (__have_o_nonblock < 0, 0)) {
-+#else
-+ {
-+#endif
- /* Make socket non-blocking. */
- int fl = __fcntl (EXT(statp).nssocks[ns], F_GETFL);
- if (fl != -1)
---- a/nscd/connections.c
-+++ b/nscd/connections.c
-@@ -1837,6 +1837,7 @@
- /* We have a new incoming connection. Accept the connection. */
- int fd;
-
-+#ifdef SOCK_NONBLOCK
- #ifndef __ASSUME_ACCEPT4
- fd = -1;
- if (have_accept4 >= 0)
-@@ -1853,6 +1854,9 @@
- if (have_accept4 < 0)
- fd = TEMP_FAILURE_RETRY (accept (sock, NULL, NULL));
- #endif
-+#else
-+ fd = TEMP_FAILURE_RETRY (accept (sock, NULL, NULL));
-+#endif
-
- /* Use the descriptor if we have not reached the limit. */
- if (fd >= 0)
-@@ -2042,7 +2046,7 @@
- {
- /* A new connection. */
- int fd;
--
-+#ifdef SOCK_NONBLOCK
- # ifndef __ASSUME_ACCEPT4
- fd = -1;
- if (have_accept4 >= 0)
-@@ -2059,6 +2063,9 @@
- if (have_accept4 < 0)
- fd = TEMP_FAILURE_RETRY (accept (sock, NULL, NULL));
- # endif
-+#else
-+ fd = TEMP_FAILURE_RETRY (accept (sock, NULL, NULL));
-+#endif
-
- /* Use the descriptor if we have not reached the limit. */
- if (fd >= 0)
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2010-01-06 23:49:30 UTC (rev 4064)
+++ glibc-package/trunk/debian/patches/series 2010-01-07 06:50:24 UTC (rev 4065)
@@ -227,3 +227,4 @@
any/cvs-resolv-edns0.diff
any/cvs-resolv-v6mapped.diff
any/submitted-nis-shadow.diff
+any/local-no-SOCK_NONBLOCK.diff
Modified: glibc-package/trunk/debian/patches/series.hurd-i386
===================================================================
--- glibc-package/trunk/debian/patches/series.hurd-i386 2010-01-06 23:49:30 UTC (rev 4064)
+++ glibc-package/trunk/debian/patches/series.hurd-i386 2010-01-07 06:50:24 UTC (rev 4065)
@@ -4,4 +4,3 @@
hurd-i386/local-pthread-unsupported-stubs.diff
hurd-i386/local-unlockpt-chroot.diff
hurd-i386/local-msg-nosignal.diff
-kfreebsd/local-no-SOCK_NONBLOCK.diff
Modified: glibc-package/trunk/debian/patches/series.kfreebsd-amd64
===================================================================
--- glibc-package/trunk/debian/patches/series.kfreebsd-amd64 2010-01-06 23:49:30 UTC (rev 4064)
+++ glibc-package/trunk/debian/patches/series.kfreebsd-amd64 2010-01-07 06:50:24 UTC (rev 4065)
@@ -2,7 +2,6 @@
kfreebsd/local-ftw.diff
kfreebsd/local-linuxthreads29.diff
kfreebsd/local-memusage_no_mremap.diff
-kfreebsd/local-no-SOCK_NONBLOCK.diff
kfreebsd/local-pthread_at_fork.diff
kfreebsd/local-readdir_r.diff
kfreebsd/local-scripts.diff
Modified: glibc-package/trunk/debian/patches/series.kfreebsd-i386
===================================================================
--- glibc-package/trunk/debian/patches/series.kfreebsd-i386 2010-01-06 23:49:30 UTC (rev 4064)
+++ glibc-package/trunk/debian/patches/series.kfreebsd-i386 2010-01-07 06:50:24 UTC (rev 4065)
@@ -2,7 +2,6 @@
kfreebsd/local-ftw.diff
kfreebsd/local-linuxthreads29.diff
kfreebsd/local-memusage_no_mremap.diff
-kfreebsd/local-no-SOCK_NONBLOCK.diff
kfreebsd/local-pthread_at_fork.diff
kfreebsd/local-readdir_r.diff
kfreebsd/local-scripts.diff
Reply to: