r1257 - in glibc-package/trunk/debian: . patches
Author: aurel32
Date: 2006-03-01 16:37:19 +0000 (Wed, 01 Mar 2006)
New Revision: 1257
Removed:
glibc-package/trunk/debian/patches/sa_len-check.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
Oops, the sa_len-check patch has been merged in 2.3.6, so no need to add it again. Removing it.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-03-01 16:17:43 UTC (rev 1256)
+++ glibc-package/trunk/debian/changelog 2006-03-01 16:37:19 UTC (rev 1257)
@@ -1,4 +1,4 @@
-glibc (2.3.6-3) UNRELEASED; urgency=low
+glibc (2.3.6-3) unstable; urgency=low
[ Aurelien Jarno]
* Use a shell function instead of ifneq when testing a variable depending on
@@ -17,8 +17,6 @@
* Make libc6-i386-dev conflicts with all versions of ia32-libs-dev. As it
won't be built anymore on amd64, this will automatically remove it during
the upgrade.
- * Add sa_len-check.diff (fix sa_len check in getaddrinfo) from upstream.
- (Closes: #309774).
[ Clint Adams ]
* Get rid of -o as a binary operator to [ in tzconfig and postinst.
@@ -29,7 +27,7 @@
localedef from 2.3.6-2 and 2.3.6-3. (Closes: #352620)
* Updated Italian debconf translation, by Luca Monducci.
- -- Aurelien Jarno <aurel32@debian.org> Thu, 23 Feb 2006 21:46:25 +0100
+ -- Aurelien Jarno <aurel32@debian.org> Wed, 1 Mar 2006 17:11:36 +0100
glibc (2.3.6-2) unstable; urgency=low
Deleted: glibc-package/trunk/debian/patches/sa_len-check.diff
===================================================================
--- glibc-package/trunk/debian/patches/sa_len-check.diff 2006-03-01 16:17:43 UTC (rev 1256)
+++ glibc-package/trunk/debian/patches/sa_len-check.diff 2006-03-01 16:37:19 UTC (rev 1257)
@@ -1,51 +0,0 @@
-2005-05-17 Neal H. Walfield <neal@gnu.org>
-
- [BZ #1350]
- * sysdeps/posix/getaddrinfo.c (gaih_local): Check [_HAVE_SA_LEN]
- instead of [SALEN].
- (gaih_inet): Likewise.
-2005-02-16 Roland McGrath <roland@redhat.com>
-
- * sysdeps/posix/getaddrinfo.c (gaih_inet): Fix type of ADDR local.
-
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/posix/getaddrinfo.c,v
-retrieving revision 1.85
-retrieving revision 1.85.2.1
-diff -u -r1.85 -r1.85.2.1
---- libc/sysdeps/posix/getaddrinfo.c 2004/11/22 18:41:37 1.85
-+++ libc/sysdeps/posix/getaddrinfo.c 2005/10/16 10:15:30 1.85.2.1
-@@ -196,10 +196,10 @@
- (*pai)->ai_addrlen = sizeof (struct sockaddr_un);
- (*pai)->ai_addr = (void *) (*pai) + sizeof (struct addrinfo);
-
--#if SALEN
-+#ifdef _HAVE_SA_LEN
- ((struct sockaddr_un *) (*pai)->ai_addr)->sun_len =
- sizeof (struct sockaddr_un);
--#endif /* SALEN */
-+#endif /* _HAVE_SA_LEN */
-
- ((struct sockaddr_un *)(*pai)->ai_addr)->sun_family = AF_LOCAL;
- memset(((struct sockaddr_un *)(*pai)->ai_addr)->sun_path, 0, UNIX_PATH_MAX);
-@@ -680,7 +680,7 @@
- h->h_length);
- else
- {
-- int32_t *addr = (uint32_t *) (*pat)->addr;
-+ uint32_t *addr = (uint32_t *) (*pat)->addr;
- addr[3] = *(uint32_t *) h->h_addr_list[i];
- addr[2] = htonl (0xffff);
- addr[1] = 0;
-@@ -1076,9 +1076,9 @@
- ai->ai_canonname = (char *) canon;
- canon = NULL;
-
--#if SALEN
-+#ifdef _HAVE_SA_LEN
- ai->ai_addr->sa_len = socklen;
--#endif /* SALEN */
-+#endif /* _HAVE_SA_LEN */
- ai->ai_addr->sa_family = family;
-
- if (family == AF_INET6)
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2006-03-01 16:17:43 UTC (rev 1256)
+++ glibc-package/trunk/debian/patches/series 2006-03-01 16:37:19 UTC (rev 1257)
@@ -132,4 +132,3 @@
rtld.diff -p1
resource_h.diff -p1
hppa-inlining.diff -p1
-sa_len-check.diff -p1
Reply to: