r4037 - in glibc-package/trunk/debian: . patches patches/any
Author: aurel32
Date: 2009-12-26 23:48:15 +0000 (Sat, 26 Dec 2009)
New Revision: 4037
Added:
glibc-package/trunk/debian/patches/any/cvs-malloc_info-output.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* Add debian/patches/any/cvs-malloc_info-output.diff from upstream to fix
malloc_info() output. Closes: #562678.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-12-25 19:54:44 UTC (rev 4036)
+++ glibc-package/trunk/debian/changelog 2009-12-26 23:48:15 UTC (rev 4037)
@@ -16,6 +16,8 @@
debian/any/cvs-nis-not-configured.diff.
* Add debian/patches/any/local-ntp-update.diff to partially update the NTP
API, backported from upstream. Closes: #559482.
+ * Add debian/patches/any/cvs-malloc_info-output.diff from upstream to fix
+ malloc_info() output. Closes: #562678.
[ Samuel Thibault ]
* testsuite-checking/expected-results-i486-linux-gnu-libc: Add hurd-i386
@@ -29,7 +31,7 @@
[ Petr Salinger]
* kfreebsd/local-sysdeps.diff: update to revision 2904 (from glibc-bsd).
- -- Aurelien Jarno <aurel32@debian.org> Fri, 25 Dec 2009 14:58:49 +0100
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 27 Dec 2009 00:47:25 +0100
eglibc (2.10.2-2) unstable; urgency=low
Added: glibc-package/trunk/debian/patches/any/cvs-malloc_info-output.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-malloc_info-output.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-malloc_info-output.diff 2009-12-26 23:48:15 UTC (rev 4037)
@@ -0,0 +1,19 @@
+2009-10-29 Ulrich Drepper <drepper@redhat.com>
+
+ [BZ #10553]
+ * malloc/malloc.c (malloc_info): Fix typos in format strings.
+ Patch by John Sullivan <jsrhbz@kanargh.force9.co.uk>.
+
+--- a/malloc/malloc.c
++++ b/malloc/malloc.c
+@@ -6474,8 +6474,8 @@ malloc_info (int options, FILE *fp)
+ fprintf (fp,
+ "<total type=\"fast\" count=\"%zu\" size=\"%zu\"/>\n"
+ "<total type=\"rest\" count=\"%zu\" size=\"%zu\"/>\n"
+- "<system type=\"current\" size=\"%zu\n/>\n"
+- "<system type=\"max\" size=\"%zu\n/>\n"
++ "<system type=\"current\" size=\"%zu\"/>\n"
++ "<system type=\"max\" size=\"%zu\"/>\n"
+ "<aspace type=\"total\" size=\"%zu\"/>\n"
+ "<aspace type=\"mprotect\" size=\"%zu\"/>\n"
+ "</malloc>\n",
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2009-12-25 19:54:44 UTC (rev 4036)
+++ glibc-package/trunk/debian/patches/series 2009-12-26 23:48:15 UTC (rev 4037)
@@ -219,3 +219,4 @@
any/submitted-getaddrinfo-nodata.diff
any/submitted-gethostbyname3.diff
any/local-ntp-update.diff
+any/cvs-malloc_info-output.diff
Reply to: