From 14b46fb49966c5beb34127a600e7be2a04d0821b Mon Sep 17 00:00:00 2001 From: root Date: Tue, 12 Jun 2012 00:01:37 +0000 Subject: Tue Jun 12 00:01:37 UTC 2012 --- core/bison/PKGBUILD | 20 +++--- core/dnsutils/PKGBUILD | 8 +-- core/glibc/PKGBUILD | 33 +++++----- core/glibc/glibc-2.15-gb18030.patch.gz | Bin 0 -> 470126 bytes core/glibc/glibc-2.15-testsuite.patch | 110 +++++++++++++++++++++++++++++++++ core/psmisc/PKGBUILD | 6 +- 6 files changed, 138 insertions(+), 39 deletions(-) create mode 100644 core/glibc/glibc-2.15-gb18030.patch.gz create mode 100644 core/glibc/glibc-2.15-testsuite.patch (limited to 'core') diff --git a/core/bison/PKGBUILD b/core/bison/PKGBUILD index 90cf43059..c96323ad0 100644 --- a/core/bison/PKGBUILD +++ b/core/bison/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 143798 2011-11-29 12:24:20Z allan $ +# $Id: PKGBUILD 161346 2012-06-10 05:52:18Z allan $ # Maintainer: Allan McRae # Contributor: Eric Belanger pkgname=bison -pkgver=2.5 -pkgrel=3 +pkgver=2.5.1 +pkgrel=1 pkgdesc="The GNU general-purpose parser generator" arch=('i686' 'x86_64') license=('GPL3') @@ -12,18 +12,12 @@ url="http://www.gnu.org/software/bison/bison.html" depends=('glibc' 'm4' 'sh') groups=('base-devel') install=bison.install -source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.bz2{,.sig} - bison-2.5-undefined-reference.patch) -md5sums=('9dba20116b13fc61a0846b0058fbe004' - '610b73db67bd4760209458efe7554ca3' - '2015c5421b2ad99032154f27bf5c4772') +source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz{,.sig}) +md5sums=('012708d801a3c986d8654aa673530b61' + '6c7e9276aa8b89879126a611384897a8') build() { - cd ${srcdir}/${pkgname}-${pkgver} - - # workaround for FS#26794 - patch -Np1 -i $srcdir/bison-2.5-undefined-reference.patch - + cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --datadir=/usr/share make } diff --git a/core/dnsutils/PKGBUILD b/core/dnsutils/PKGBUILD index 5466de114..9fc510129 100644 --- a/core/dnsutils/PKGBUILD +++ b/core/dnsutils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 159411 2012-05-23 22:28:25Z bisson $ +# $Id: PKGBUILD 161356 2012-06-10 08:42:42Z bisson $ # Maintainer: Gaetan Bisson # Contributor: kevin # Contributor: mario @@ -6,8 +6,8 @@ pkgname=dnsutils # Use a period and not a hyphen before the patch level for proper versioning. -pkgver=9.9.1 -_pkgver=9.9.1 +pkgver=9.9.1.P1 +_pkgver=9.9.1-P1 pkgrel=1 pkgdesc='DNS utilities: dig host nslookup' @@ -18,7 +18,7 @@ options=('!makeflags') depends=('openssl' 'krb5' 'idnkit' 'dnssec-anchors') source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" 'remove-bind.patch') -sha1sums=('c963de85ba6f55d7615471b29b356efe6c844e9c' +sha1sums=('a2263b96ccd8a143ea54b39958142c542bf605a8' 'b465ef6160b004838f04de9978fe1be8422af777') replaces=('bind-tools' 'host') diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 46265e4d5..d9b1c4a78 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 155407 2012-04-03 11:10:25Z allan $ +# $Id: PKGBUILD 161348 2012-06-10 05:52:29Z allan $ # Maintainer: Allan McRae # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,7 +6,7 @@ pkgname=glibc pkgver=2.15 -pkgrel=10 +pkgrel=11 _glibcdate=20111227 pkgdesc="GNU C Library" arch=('i686' 'x86_64') @@ -24,7 +24,6 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t glibc-2.15-do-not-install-timezone-files.patch glibc-2.15-do-not-install-timezone-files-2.patch glibc-__i686.patch - glibc-2.12.2-ignore-origin-of-privileged-program.patch glibc-2.14-libdl-crash.patch glibc-2.14-reexport-rpc-interface.patch glibc-2.14-reinstall-nis-rpc-headers.patch @@ -36,7 +35,7 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t glibc-2.15-ifunc.patch glibc-2.15-avx.patch glibc-2.15-strcasecmp-disable-avx.patch - glibc-2.15-gb18030.patch + glibc-2.15-gb18030.patch.gz glibc-2.15-revert-netlink-cache.patch glibc-2.15-arena.patch glibc-2.15-negative-result-cache.patch @@ -50,6 +49,7 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t glibc-2.15-rintf-rounding.patch glibc-2.15-nearbyintf-rounding.patch glibc-2.15-confstr-local-buffer-extent.patch + glibc-2.15-testsuite.patch nscd locale.gen.txt locale-gen) @@ -57,7 +57,6 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc' '7ef69c530a15106de93e4de2df2d393e' 'b6c619e5cf91829a15ce34dccef676d5' 'addfddd648a4bf832eb126aba944ebae' - 'e60e33591c9ec1447e4cddadcbb9cf3a' '6970bcfeb3bf88913436d5112d16f588' 'c5de2a946215d647c8af5432ec4b0da0' '55febbb72139ac7b65757df085024b83' @@ -69,7 +68,7 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc' '3d844b53b2dbb7c996e39c7ad932f55d' '41ae047ac88e8f6f547c70b0a0bc3b72' 'fccb89f6628f59752278e125c35941f8' - 'c4cd34f20ccd37817f6c1374bd4ee68e' + '001a4044ac3d59aca6ee144eaca57ab2' '94b61302a7ca6c5764d013dc7738fcfe' 'a9ffadcfd2d357f91fee0b861fd4a7c6' '2c46b8e294de24c531f2253ff69aeef3' @@ -83,11 +82,11 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc' '1419d61fd1dbc6cdc48bb59da86fa66f' '7ff501435078b1a2622124fbeaafc921' '8d1023a51e0932681b46440d5f8551ee' + '6962c3fa29306bfbf6f0d22b19cb825d' 'b587ee3a70c9b3713099295609afde49' '07ac979b6ab5eeb778d55f041529d623' '476e9113489f93b348b21e144b6a8fcf') - mksource() { git clone git://sourceware.org/git/glibc.git pushd glibc @@ -111,10 +110,6 @@ build() { # http://sourceware.org/glibc/wiki/Release/2.15#Build_Failures patch -p1 -i ${srcdir}/glibc-__i686.patch - # http://www.exploit-db.com/exploits/15274/ - # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (fedora branch) - patch -p1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (fedora branch) # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html patch -p1 -i ${srcdir}/glibc-2.14-libdl-crash.patch @@ -165,7 +160,7 @@ build() { patch -p1 -i ${srcdir}/glibc-2.15-gb18030.patch # fix crash in __nscd_get_mapping if nscd not running - # http://sourceware.org/bugzilla/show_bug.cgi?id=13594 (potential "fix" in comment) + # http://sourceware.org/bugzilla/show_bug.cgi?id=13594 (potential fix in comment) # reverts commit 3a2c0242 and other necessary following changes... patch -p1 -i ${srcdir}/glibc-2.15-revert-netlink-cache.patch @@ -218,6 +213,10 @@ build() { # http://sourceware.org/git/?p=glibc.git;a=commit;h=d6a403f9 patch -p1 -i ${srcdir}/glibc-2.15-confstr-local-buffer-extent.patch + # fix testsuite failures with --as-needed + # http://sourceware.org/git/?p=glibc.git;a=commit;h=d4c2917f + patch -p1 -i ${srcdir}/glibc-2.15-testsuite.patch + install -dm755 ${pkgdir}/etc touch ${pkgdir}/etc/ld.so.conf @@ -242,9 +241,7 @@ build() { --with-headers=/usr/include \ --enable-add-ons=nptl,libidn \ --enable-kernel=2.6.32 \ - --with-tls --with-__thread \ - --enable-bind-now --without-gd \ - --without-cvs --disable-profile \ + --enable-bind-now --disable-profile \ --enable-multi-arch # build libraries with hardening disabled @@ -252,7 +249,7 @@ build() { make # re-enable hardening for programs - sed -i "s#=no#=yes#" configparms + sed -i "/build-programs=/s#no#yes#" configparms echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms make @@ -263,9 +260,7 @@ build() { check() { cd ${srcdir}/glibc-build - - # some errors are expected - manually check log files - make -k check || true + make -k check } package() { diff --git a/core/glibc/glibc-2.15-gb18030.patch.gz b/core/glibc/glibc-2.15-gb18030.patch.gz new file mode 100644 index 000000000..dde59c056 Binary files /dev/null and b/core/glibc/glibc-2.15-gb18030.patch.gz differ diff --git a/core/glibc/glibc-2.15-testsuite.patch b/core/glibc/glibc-2.15-testsuite.patch new file mode 100644 index 000000000..7eaeaed65 --- /dev/null +++ b/core/glibc/glibc-2.15-testsuite.patch @@ -0,0 +1,110 @@ +From d4c2917fc5091dae7ab1b30c165becb70d3c3453 Mon Sep 17 00:00:00 2001 +From: Allan McRae +Date: Mon, 16 Apr 2012 14:06:47 +1000 +Subject: [PATCH] Fix test-suite failues with -Wl,--as-needed + +Signed-off-by: Allan McRae +--- + ChangeLog | 24 ++++++++++++++++++++++++ + elf/Makefile | 21 ++++++++++++++++++++- + nptl/ChangeLog | 5 +++++ + nptl/Makefile | 3 ++- + stdlib/Makefile | 1 + + 5 files changed, 52 insertions(+), 2 deletions(-) + +diff --git a/elf/Makefile b/elf/Makefile +index 57dcab0..47729c3 100644 +--- a/elf/Makefile ++++ b/elf/Makefile +@@ -500,6 +500,18 @@ $(objpfx)tst-initordera3.so: $(objpfx)tst-initorderb2.so $(objpfx)tst-initorderb + $(objpfx)tst-initordera4.so: $(objpfx)tst-initordera3.so + $(objpfx)tst-initorder: $(objpfx)tst-initordera4.so $(objpfx)tst-initordera1.so $(objpfx)tst-initorderb2.so + ++LDFLAGS-nodel2mod3.so = $(no-as-needed) ++LDFLAGS-reldepmod5.so = $(no-as-needed) ++LDFLAGS-reldep6mod1.so = $(no-as-needed) ++LDFLAGS-reldep6mod4.so = $(no-as-needed) ++LDFLAGS-reldep8mod3.so = $(no-as-needed) ++LDFLAGS-unload4mod1.so = $(no-as-needed) ++LDFLAGS-unload4mod2.so = $(no-as-needed) ++LDFLAGS-tst-initorder = $(no-as-needed) ++LDFLAGS-tst-initordera2.so = $(no-as-needed) ++LDFLAGS-tst-initordera3.so = $(no-as-needed) ++LDFLAGS-tst-initordera4.so = $(no-as-needed) ++LDFLAGS-tst-initorderb2.so = $(no-as-needed) + LDFLAGS-tst-tlsmod5.so = -nostdlib + LDFLAGS-tst-tlsmod6.so = -nostdlib + +@@ -633,7 +645,7 @@ $(objpfx)vismain.out: $(addprefix $(objpfx),vismod3.so) + vismain-ENV = LD_PRELOAD=$(addprefix $(objpfx),vismod3.so) + + $(objpfx)noload: $(objpfx)testobj1.so $(common-objpfx)dlfcn/libdl.so +-LDFLAGS-noload = -rdynamic ++LDFLAGS-noload = -rdynamic $(no-as-needed) + $(objpfx)noload.out: $(objpfx)testobj5.so + + $(objpfx)noload-mem: $(objpfx)noload.out +@@ -678,6 +690,7 @@ $(objpfx)reldep4: $(libdl) + $(objpfx)reldep4.out: $(objpfx)reldep4mod1.so $(objpfx)reldep4mod2.so + + $(objpfx)next: $(objpfx)nextmod1.so $(objpfx)nextmod2.so $(libdl) ++LDFLAGS-next = $(no-as-needed) + + $(objpfx)unload2: $(libdl) + $(objpfx)unload2.out: $(objpfx)unload2mod.so $(objpfx)unload2dep.so +@@ -1025,6 +1038,8 @@ $(objpfx)order2mod1.so: $(objpfx)order2mod4.so + $(objpfx)order2mod4.so: $(objpfx)order2mod3.so + $(objpfx)order2mod2.so: $(objpfx)order2mod3.so + order2mod2.so-no-z-defs = yes ++LDFLAGS-order2mod1.so = $(no-as-needed) ++LDFLAGS-order2mod2.so = $(no-as-needed) + + tst-stackguard1-ARGS = --command "$(built-program-cmd) --child" + tst-stackguard1-static-ARGS = --command "$(objpfx)tst-stackguard1-static --child" +@@ -1113,6 +1128,10 @@ $(objpfx)tst-initorder2: $(objpfx)tst-initorder2a.so $(objpfx)tst-initorder2d.so + $(objpfx)tst-initorder2a.so: $(objpfx)tst-initorder2b.so + $(objpfx)tst-initorder2b.so: $(objpfx)tst-initorder2c.so + $(objpfx)tst-initorder2c.so: $(objpfx)tst-initorder2d.so ++LDFLAGS-tst-initorder2 = $(no-as-needed) ++LDFLAGS-tst-initorder2a.so = $(no-as-needed) ++LDFLAGS-tst-initorder2b.so = $(no-as-needed) ++LDFLAGS-tst-initorder2c.so = $(no-as-needed) + define o-iterator-doit + $(objpfx)tst-initorder2$o.os: tst-initorder2.c; \ + $$(compile-command.c) -DNAME=\"$o\" +diff --git a/nptl/Makefile b/nptl/Makefile +index 09acd8a..07a1022 100644 +--- a/nptl/Makefile ++++ b/nptl/Makefile +@@ -458,6 +458,7 @@ $(objpfx)tst-tls4: $(libdl) $(shared-thread-library) + $(objpfx)tst-tls4.out: $(objpfx)tst-tls4moda.so $(objpfx)tst-tls4modb.so + + $(objpfx)tst-tls5: $(objpfx)tst-tls5mod.so $(shared-thread-library) ++LDFLAGS-tst-tls5 = $(no-as-needed) + LDFLAGS-tst-tls5mod.so = -Wl,-soname,tst-tls5mod.so + + ifeq ($(build-shared),yes) +@@ -503,7 +504,7 @@ $(objpfx)tst-clock2: $(common-objpfx)rt/librt.a + $(objpfx)tst-rwlock14: $(common-objpfx)rt/librt.a + endif + +-LDFLAGS-tst-cancel24 = -lstdc++ ++LDFLAGS-tst-cancel24 = $(no-as-needed) -lstdc++ + + extra-B-pthread.so = -B$(common-objpfx)nptl/ + $(objpfx)libpthread.so: $(addprefix $(objpfx),$(crti-objs) $(crtn-objs)) +diff --git a/stdlib/Makefile b/stdlib/Makefile +index 44eb20d..f7811c5 100644 +--- a/stdlib/Makefile ++++ b/stdlib/Makefile +@@ -138,6 +138,7 @@ $(objpfx)tst-fmtmsg.out: tst-fmtmsg.sh $(objpfx)tst-fmtmsg + $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)stdlib/ + + $(objpfx)tst-putenv: $(objpfx)tst-putenvmod.so ++LDFLAGS-tst-putenv = $(no-as-needed) + + $(objpfx)tst-putenvmod.so: $(objpfx)tst-putenvmod.os + $(build-module) +-- +1.7.3.4 + diff --git a/core/psmisc/PKGBUILD b/core/psmisc/PKGBUILD index dcf09fca8..3cf8b44ba 100644 --- a/core/psmisc/PKGBUILD +++ b/core/psmisc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 153948 2012-03-21 02:16:23Z eric $ +# $Id: PKGBUILD 161394 2012-06-11 01:18:35Z eric $ # Maintainer: Eric Bélanger pkgname=psmisc -pkgver=22.16 +pkgver=22.17 pkgrel=1 pkgdesc="Miscellaneous procfs tools" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('GPL') groups=('base') depends=('ncurses') source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz) -sha1sums=('27f1c8deab06e79101af1914ff81a9d561f2fcfe') +sha1sums=('5d400710cf030bf7396aec40f53e933942ec8b4a') build() { cd "${srcdir}/${pkgname}-${pkgver}" -- cgit v1.2.3-54-g00ecf