r4680 - in glibc-package/trunk/debian: . patches/kfreebsd
Author: aurel32
Date: 2011-05-24 14:48:21 +0000 (Tue, 24 May 2011)
New Revision: 4680
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
Log:
* kfreebsd/local-sysdeps.diff, update to revision 3303 (from glibc-bsd),
to fix if_nameindex() bugs.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-05-24 14:24:12 UTC (rev 4679)
+++ glibc-package/trunk/debian/changelog 2011-05-24 14:48:21 UTC (rev 4680)
@@ -22,8 +22,8 @@
* patches/any/local-ld-multiarch.diff: add the multiarch compat dir
instead of the multiarch dir.
* Use the multiarch path for the native version and optimized flavors.
- * kfreebsd/local-sysdeps.diff, update to revision 3302 (from glibc-bsd),
- fix brk() and semctl() breakage.
+ * kfreebsd/local-sysdeps.diff, update to revision 3303 (from glibc-bsd),
+ to fix brk(), semctl() and if_nameindex() bugs.
[ Steve Langasek ]
* Tighten the dependency on dpkg to a multiarch aware version.
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2011-05-24 14:24:12 UTC (rev 4679)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2011-05-24 14:48:21 UTC (rev 4680)
@@ -14195,8 +14195,8 @@
+ {
+ size_t new_allocated =
+ (l->c_len + n < 2 * l->c_allocated + 1
-+ ? l->c_len + n
-+ : 2 * l->c_allocated + 1);
++ ? 2 * l->c_allocated + 1
++ : l->c_len + n);
+ char *new_array = (char *) realloc (l->c_array, new_allocated);
+ if (new_array == NULL)
+ {
Reply to: