r2258 - in glibc-package/branches/glibc-2.6/debian: . patches patches/any
Author: aurel32
Date: 2007-05-20 07:59:56 +0000 (Sun, 20 May 2007)
New Revision: 2258
Removed:
glibc-package/branches/glibc-2.6/debian/patches/any/submitted-gethostbyname_r.diff
Modified:
glibc-package/branches/glibc-2.6/debian/changelog
glibc-package/branches/glibc-2.6/debian/patches/series
Log:
- Remove any/submitted-gethostbyname_r.diff (obsolete).
Modified: glibc-package/branches/glibc-2.6/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.6/debian/changelog 2007-05-20 07:50:57 UTC (rev 2257)
+++ glibc-package/branches/glibc-2.6/debian/changelog 2007-05-20 07:59:56 UTC (rev 2258)
@@ -32,7 +32,7 @@
- Remove any/cvs-vfprintf-stack-smashing.diff (obsolete).
- Remove any/cvs-zdump-64-bit.diff (obsolete).
- Disable any/local-ldso-disable-hwcap.diff (broken).
- - Disable any/submitted-gethostbyname_r.diff (broken).
+ - Remove any/submitted-gethostbyname_r.diff (obsolete).
- Remove any/submitted-iconv-colon.diff (merged upstream).
- Disable any/submitted-strfry.diff (broken).
- Disable any/submitted-unistd_XOPEN_VERSION.diff (broken).
Deleted: glibc-package/branches/glibc-2.6/debian/patches/any/submitted-gethostbyname_r.diff
===================================================================
--- glibc-package/branches/glibc-2.6/debian/patches/any/submitted-gethostbyname_r.diff 2007-05-20 07:50:57 UTC (rev 2257)
+++ glibc-package/branches/glibc-2.6/debian/patches/any/submitted-gethostbyname_r.diff 2007-05-20 07:59:56 UTC (rev 2258)
@@ -1,32 +0,0 @@
---- resolv/nss_dns/dns-host.c.orig 2007-04-16 00:13:12.000000000 +0200
-+++ resolv/nss_dns/dns-host.c 2007-04-16 00:34:41.000000000 +0200
-@@ -78,6 +78,7 @@
- #include <stdlib.h>
- #include <stddef.h>
- #include <string.h>
-+#include <obstack.h>
- #include <sys/syslog.h>
-
- #include "nsswitch.h"
-@@ -465,8 +466,8 @@
- char *aliases[MAX_NR_ALIASES];
- unsigned char host_addr[16]; /* IPv4 or IPv6 */
- char *h_addr_ptrs[0];
-- } *host_data = (struct host_data *) buffer;
-- int linebuflen = buflen - sizeof (struct host_data);
-+ } *host_data;
-+ int linebuflen;
- register const HEADER *hp;
- const u_char *end_of_message, *cp;
- int n, ancount, qdcount;
-@@ -479,6 +480,10 @@
- int have_to_map = 0;
- int32_t ttl = 0;
-
-+ /* Align the buffer. */
-+ host_data = (struct host_data *) __PTR_ALIGN(0, buffer, sizeof(char*) - 1);
-+ linebuflen = buflen - sizeof (struct host_data) - ((char *)host_data - buffer);
-+
- if (__builtin_expect (linebuflen, 0) < 0)
- {
- /* The buffer is too small. */
Modified: glibc-package/branches/glibc-2.6/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.6/debian/patches/series 2007-05-20 07:50:57 UTC (rev 2257)
+++ glibc-package/branches/glibc-2.6/debian/patches/series 2007-05-20 07:59:56 UTC (rev 2258)
@@ -124,7 +124,6 @@
any/submitted-getcwd-sys_param_h.diff -p0
any/submitted-clock-settime.diff -p0
any/submitted-date-and-unknown-tz.diff -p0
-#any/submitted-gethostbyname_r.diff -p0
#any/submitted-strfry.diff -p0
#any/submitted-unistd_XOPEN_VERSION.diff
any/local-disable-nscd-host-caching.diff
Reply to: