Date: Saturday, March 24, 2012 @ 22:42:21 Author: allan Revision: 154259
upgpkg: glibc 2.15-9 fix getconf output (and file names created using it) Added: glibc/trunk/glibc-2.15-confstr-strdup.patch Modified: glibc/trunk/PKGBUILD ---------------------------------+ PKGBUILD | 7 ++++++- glibc-2.15-confstr-strdup.patch | 31 +++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-03-25 02:41:53 UTC (rev 154258) +++ PKGBUILD 2012-03-25 02:42:21 UTC (rev 154259) @@ -6,7 +6,7 @@ pkgname=glibc pkgver=2.15 -pkgrel=8 +pkgrel=9 _glibcdate=20111227 pkgdesc="GNU C Library" arch=('i686' 'x86_64') @@ -49,6 +49,7 @@ glibc-2.15-non-signalling-comparisons.patch glibc-2.15-rintf-rounding.patch glibc-2.15-nearbyintf-rounding.patch + glibc-2.15-confstr-strdup.patch nscd locale.gen.txt locale-gen) @@ -81,6 +82,7 @@ 'c483504cf404ed0b44480af627813a97' '1419d61fd1dbc6cdc48bb59da86fa66f' '7ff501435078b1a2622124fbeaafc921' + '41f94da2f8db856b091a2d670d68eee3' 'b587ee3a70c9b3713099295609afde49' '07ac979b6ab5eeb778d55f041529d623' '476e9113489f93b348b21e144b6a8fcf') @@ -212,6 +214,9 @@ # http://sourceware.org/git/?p=glibc.git;a=commit;h=6cbeae47 patch -p1 -i ${srcdir}/glibc-2.15-nearbyintf-rounding.patch + # fix varaible scope issue exposed with gcc-4.7 and -O2 + patch -p1 -i ${srcdir}/glibc-2.15-confstr-strdup.patch + install -dm755 ${pkgdir}/etc touch ${pkgdir}/etc/ld.so.conf Added: glibc-2.15-confstr-strdup.patch =================================================================== --- glibc-2.15-confstr-strdup.patch (rev 0) +++ glibc-2.15-confstr-strdup.patch 2012-03-25 02:42:21 UTC (rev 154259) @@ -0,0 +1,31 @@ +diff --git a/posix/confstr.c b/posix/confstr.c +index 3c9566d..3ba9e5a 100644 +--- a/posix/confstr.c ++++ b/posix/confstr.c +@@ -104,7 +104,7 @@ confstr (name, buf, len) + } + #endif + restenvs[string_len++] = '\0'; +- string = restenvs; ++ string = strdup(restenvs); + } + break; + +@@ -167,7 +167,7 @@ confstr (name, buf, len) + } + #endif + restenvs[string_len++] = '\0'; +- string = restenvs; ++ string = strdup(restenvs); + } + break; + +@@ -230,7 +230,7 @@ confstr (name, buf, len) + } + #endif + restenvs[string_len++] = '\0'; +- string = restenvs; ++ string = strdup(restenvs); + } + break; +