diff options
Diffstat (limited to 'core')
103 files changed, 1813 insertions, 565 deletions
diff --git a/core/acl/PKGBUILD b/core/acl/PKGBUILD index 0b68f0d2a..f3b4c1d5b 100644 --- a/core/acl/PKGBUILD +++ b/core/acl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188195 2013-06-12 15:53:07Z thomas $ +# $Id: PKGBUILD 197385 2013-10-25 08:24:54Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=acl pkgver=2.2.52 -pkgrel=1 +pkgrel=2 pkgdesc="Access control list utilities, libraries and headers" arch=('i686' 'x86_64' 'mips64el') url="http://savannah.nongnu.org/projects/acl" @@ -12,7 +12,6 @@ depends=('attr>=2.4.46') replaces=('xfsacl') provides=('xfsacl') conflicts=('xfsacl') -options=('!libtool') source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.src.tar.gz"{,.sig}) sha256sums=('179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23' 'SKIP') diff --git a/core/attr/PKGBUILD b/core/attr/PKGBUILD index 7d0615c97..16065788d 100644 --- a/core/attr/PKGBUILD +++ b/core/attr/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188196 2013-06-12 15:53:08Z thomas $ +# $Id: PKGBUILD 197803 2013-10-30 11:02:33Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=attr @@ -13,7 +13,6 @@ makedepends=('gettext') replaces=('xfsattr') provides=('xfsattr') conflicts=('xfsattr') -options=('!libtool') source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.src.tar.gz"{,.sig}) sha256sums=('25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859' 'SKIP') diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD index 9ca57f86e..cc83e065e 100644 --- a/core/binutils/PKGBUILD +++ b/core/binutils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193064 2013-08-15 12:08:13Z allan $ +# $Id: PKGBUILD 196835 2013-10-20 12:06:12Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -13,7 +13,7 @@ license=('GPL') groups=('base-devel') depends=('glibc>=2.18' 'zlib') checkdepends=('dejagnu' 'bc') -options=('!libtool' '!distcc' '!ccache') +options=('staticlibs' '!distcc' '!ccache') install=binutils.install source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig} binutils-2.23.2-texinfo-5.0.patch) diff --git a/core/bison/PKGBUILD b/core/bison/PKGBUILD index f4a47d19b..7e601b013 100644 --- a/core/bison/PKGBUILD +++ b/core/bison/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 191960 2013-08-02 00:55:04Z allan $ +# $Id: PKGBUILD 196831 2013-10-20 11:52:24Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> @@ -11,6 +11,7 @@ license=('GPL3') url="http://www.gnu.org/software/bison/bison.html" depends=('glibc' 'm4' 'sh') groups=('base-devel') +options=('staticlibs') install=bison.install source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz{,.sig}) md5sums=('a2624994561aa69f056c904c1ccb2880' diff --git a/core/bzip2/PKGBUILD b/core/bzip2/PKGBUILD index 7ef4a7c49..8601505b5 100644 --- a/core/bzip2/PKGBUILD +++ b/core/bzip2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 158054 2012-05-02 01:12:57Z allan $ +# $Id: PKGBUILD 197160 2013-10-23 13:04:57Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Judd <jvinet@zeroflux.org> pkgname=bzip2 pkgver=1.0.6 -pkgrel=4.1 +pkgrel=5 pkgdesc="A high-quality data compression program" arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -29,7 +29,7 @@ build() { patch -Np1 < ../bzip2-1.0.4-bzip2recover.patch make -f Makefile-libbz2_so - make bzip2 bzip2recover libbz2.a + make bzip2 bzip2recover } check() { @@ -51,7 +51,6 @@ package() { ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so.1 ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so.1.0 - install -m644 libbz2.a ${pkgdir}/usr/lib/libbz2.a install -m644 bzlib.h $pkgdir/usr/include/ diff --git a/core/cloog/PKGBUILD b/core/cloog/PKGBUILD index d5a38a163..780e8e0d4 100644 --- a/core/cloog/PKGBUILD +++ b/core/cloog/PKGBUILD @@ -1,26 +1,16 @@ -# $Id: PKGBUILD 188781 2013-06-20 06:35:09Z allan $ +# $Id: PKGBUILD 197161 2013-10-23 13:04:58Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> pkgname=cloog -pkgver=0.18.0 +pkgver=0.18.1 pkgrel=2 pkgdesc="Library that generates loops for scanning polyhedra" arch=('i686' 'x86_64' 'mips64el') url="http://www.bastoul.net/cloog/" license=('GPL') -depends=('isl' 'gmp') -options=('!libtool') -source=(http://www.bastoul.net/cloog/pages/download/$pkgname-$pkgver.tar.gz - cloog-0.18.0-isl-0.11.2.patch) -md5sums=('be78a47bd82523250eb3e91646db5b3d' - '1bec9a7f1c3e9e0f3f10f23898f7148d') - -prepare() { - cd $srcdir/$pkgname-$pkgver - - # test-suite fix - commit fc8b0627 - patch -p1 -i $srcdir/cloog-0.18.0-isl-0.11.2.patch -} +depends=('isl') +source=(http://www.bastoul.net/cloog/pages/download/$pkgname-$pkgver.tar.gz) +md5sums=('e34fca0540d840e5d0f6427e98c92252') build() { cd $srcdir/$pkgname-$pkgver diff --git a/core/cloog/cloog-0.18.0-isl-0.11.2.patch b/core/cloog/cloog-0.18.0-isl-0.11.2.patch deleted file mode 100644 index ca4290b68..000000000 --- a/core/cloog/cloog-0.18.0-isl-0.11.2.patch +++ /dev/null @@ -1,95 +0,0 @@ -diff --git a/test/darte.c b/test/darte.c -index e185b7a..2a4a1b8 100644 ---- a/test/darte.c -+++ b/test/darte.c -@@ -6,14 +6,14 @@ if (n >= 1) { - } - } - for (t1=-n+2;t1<=n-1;t1++) { -- if (t1 >= 2) { -+ if (t1 >= 0) { - for (t3=t1+4;t3<=t1+2*n+2;t3++) { - if ((t1+t3)%2 == 0) { - S1(t1+1,1,(-t1+t3-2)/2); - } - } - } -- for (t2=max(-t1+2,t1+2);t2<=-t1+4;t2++) { -+ for (t2=max(-t1+2,t1+3);t2<=-t1+4;t2++) { - for (t3=t2+2;t3<=t2+2*n;t3++) { - if ((t1+t2)%2 == 0) { - if ((t1+t3)%2 == 0) { -diff --git a/test/dartef.f b/test/dartef.f -index 50e1073..3b5e3e2 100644 ---- a/test/dartef.f -+++ b/test/dartef.f -@@ -6,14 +6,14 @@ IF (n >= 1) THEN - END IF - END DO - DO t1=-n+2, n-1 -- IF (t1 >= 2) THEN -+ IF (t1 >= 0) THEN - DO t3=t1+4, t1+2*n+2 - IF (MOD(t1+t3, 2) == 0) THEN - S1(t1+1,1,(-t1+t3-2)/2) - END IF - END DO - END IF -- DO t2=MAX(-t1+2,t1+2), -t1+4 -+ DO t2=MAX(-t1+2,t1+3), -t1+4 - DO t3=t2+2, t2+2*n - IF (MOD(t1+t2, 2) == 0) THEN - IF (MOD(t1+t3, 2) == 0) THEN -diff --git a/test/dealII.c b/test/dealII.c -index 200b257..5d28c4a 100644 ---- a/test/dealII.c -+++ b/test/dealII.c -@@ -3,10 +3,13 @@ for (scat_0=0;scat_0<=min(T_66,T_2-1);scat_0++) { - S1(scat_0); - S2(scat_0); - } --if ((T_2 == 0) && (T_67 == 0)) { -+if ((T_2 == 0) && (T_66 >= 0) && (T_67 == 0)) { - S1(0); - } --for (scat_0=max(0,T_66+1);scat_0<=T_2-1;scat_0++) { -+if ((T_66 <= -1) && (T_67 == 0)) { -+ S1(0); -+} -+for (scat_0=max(max(0,T_66+1),-T_67+1);scat_0<=T_2-1;scat_0++) { - S1(scat_0); - } - for (scat_0=T_2;scat_0<=min(T_66,T_67-1);scat_0++) { -diff --git a/test/isl/jacobi-shared.c b/test/isl/jacobi-shared.c -index e8e5ec7..9e345c6 100644 ---- a/test/isl/jacobi-shared.c -+++ b/test/isl/jacobi-shared.c -@@ -1,6 +1,6 @@ - /* Generated from ../../../git/cloog/test/isl/jacobi-shared.cloog by CLooG 0.16.3-2-g5511bef gmp bits in 1.82s. */ - if ((h0+1)%2 == 0) { -- if ((16*floord(t0-1,16) >= -N+g1+t0+1) && (16*floord(N+15*g1+15*t0+15,16) >= 15*g1+15*t0+19) && (32*floord(t1-1,32) <= g2+t1-3) && (32*floord(t1-1,32) >= -N+g2+t1+1)) { -+ if ((16*floord(N+15*g1+15*t0+15,16) >= 15*g1+15*t0+19) && (16*floord(N+15*g1+15*t0+15,16) >= 16*g1+15*t0+17) && (32*floord(t1-1,32) <= g2+t1-3) && (32*floord(t1-1,32) >= -N+g2+t1+1)) { - for (c0=max(-16*floord(t0-1,16)+t0,-16*floord(g1+t0-3,16)+t0);c0<=min(32,N-g1-1);c0+=16) { - c1 = 32*floord(-t1,32)+t1+32; - if (c1 <= 32) { -diff --git a/test/vasilache.c b/test/vasilache.c -index 5a00a33..fdff031 100644 ---- a/test/vasilache.c -+++ b/test/vasilache.c -@@ -15,12 +15,12 @@ for (p1=0;p1<=N-1;p1++) { - S6(p1,p3,p5,p7-1); - S7(p1,p3,p5,p7); - } -- if (p5 <= floord(N-33,32)) { -- S6(p1,p3,p5,32*p5+31); -- } -- if (p5 >= ceild(N-32,32)) { -+ if (p5 >= ceild(N-31,32)) { - S6(p1,p3,p5,N-1); - } -+ if (p5 <= floord(N-32,32)) { -+ S6(p1,p3,p5,32*p5+31); -+ } - } - } - } diff --git a/core/cracklib/PKGBUILD b/core/cracklib/PKGBUILD index aa65edc8f..fe94b5378 100644 --- a/core/cracklib/PKGBUILD +++ b/core/cracklib/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 191698 2013-07-29 09:44:29Z tpowa $ +# $Id: PKGBUILD 197804 2013-10-30 11:02:40Z allan $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> pkgname=cracklib pkgver=2.9.0 -pkgrel=1 +pkgrel=2 pkgdesc="Password Checking Library" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://sourceforge.net/projects/cracklib" depends=('glibc' 'zlib') -options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) md5sums=('e0f94ac2138fd33c7e77b19c1e9a9390') diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD index e86517e26..5c9b60735 100644 --- a/core/cryptsetup/PKGBUILD +++ b/core/cryptsetup/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 195910 2013-10-05 07:30:48Z thomas $ +# $Id: PKGBUILD 197805 2013-10-30 11:02:47Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=cryptsetup pkgver=1.6.2 @@ -9,7 +9,7 @@ license=('GPL') url="http://code.google.com/p/cryptsetup/" groups=('base') depends=('device-mapper' 'libgcrypt' 'popt' 'util-linux') -options=('!libtool' '!emptydirs') +options=('!emptydirs') source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc encrypt_hook diff --git a/core/curl/0001-curl_multi_remove_handle-allow-multiple-removes.patch b/core/curl/0001-curl_multi_remove_handle-allow-multiple-removes.patch deleted file mode 100644 index 73b23ea12..000000000 --- a/core/curl/0001-curl_multi_remove_handle-allow-multiple-removes.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 84f3b3dd448399f9548468676e1bd1475dba8de5 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg <daniel@haxx.se> -Date: Thu, 29 Aug 2013 22:08:01 +0200 -Subject: [PATCH] curl_multi_remove_handle: allow multiple removes - -When removing an already removed handle, avoid that to ruin the -internals and just return OK instead. ---- - lib/multi.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/lib/multi.c b/lib/multi.c -index fb495e0..e723a3e 100644 ---- a/lib/multi.c -+++ b/lib/multi.c -@@ -483,6 +483,10 @@ CURLMcode curl_multi_remove_handle(CURLM *multi_handle, - if(!GOOD_EASY_HANDLE(curl_handle)) - return CURLM_BAD_EASY_HANDLE; - -+ /* Prevent users from trying to remove same easy handle more than once */ -+ if(!data->multi) -+ return CURLM_OK; /* it is already removed so let's say it is fine! */ -+ - if(easy) { - bool premature = (data->mstate < CURLM_STATE_COMPLETED) ? TRUE : FALSE; - bool easy_owns_conn = (data->easy_conn && --- -1.8.4 - diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD index af22269df..06868fc7f 100644 --- a/core/curl/PKGBUILD +++ b/core/curl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193944 2013-09-07 15:30:07Z dreisner $ +# $Id: PKGBUILD 198761 2013-11-03 13:49:41Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> @@ -6,27 +6,27 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=curl -pkgver=7.32.0 -pkgrel=2 +pkgver=7.33.0 +pkgrel=3 pkgdesc="An URL retrieval utility and library" arch=('i686' 'x86_64' 'mips64el') url="http://curl.haxx.se" license=('MIT') depends=('ca-certificates' 'libssh2' 'openssl' 'zlib') provides=('libcurl.so') -options=('!libtool') +options=('strip' 'debug') source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} - 0001-curl_multi_remove_handle-allow-multiple-removes.patch + "0001-glob-fix-regression-from-commit-5ca96cb844.patch::https://github.com/bagder/curl/commit/867b52a.patch" curlbuild.h) -md5sums=('f77cf3cb59cf2bfe686b80338323fd40' +md5sums=('c8a4eaac7ce7b0d1bf458d62ccd4ef93' 'SKIP' - '589a2ccdf90e198fca398809e9d16128' + 'd71c7eab7d38f1731f78285634a4c390' '751bd433ede935c8fae727377625a8ae') prepare() { cd "$pkgname-$pkgver" - patch -Np1 <"$srcdir"/0001-curl_multi_remove_handle-allow-multiple-removes.patch + patch -Np1 < "$srcdir"/0001-glob-fix-regression-from-commit-5ca96cb844.patch } build() { diff --git a/core/db/PKGBUILD b/core/db/PKGBUILD index 0d5a9dc20..f29e0eefc 100644 --- a/core/db/PKGBUILD +++ b/core/db/PKGBUILD @@ -1,20 +1,18 @@ -# $Id: PKGBUILD 195826 2013-10-01 16:41:14Z bpiotrowski $ +# $Id: PKGBUILD 197695 2013-10-28 15:56:31Z andyrtr $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=db -pkgver=5.3.21 -pkgrel=2 +pkgver=5.3.28 +pkgrel=1 pkgdesc="The Berkeley DB embedded database system" arch=('i686' 'x86_64' 'mips64el') url="http://www.oracle.com/technology/software/products/berkeley-db/index.html" license=('custom') depends=('gcc-libs' 'sh') -options=('!libtool') -install=db.install source=(http://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz) -sha1sums=('32e43c4898c8996750c958a90c174bd116fcba83') +sha1sums=('fa3f8a41ad5101f43d08bc0efb6241c9b6fc1ae9') build() { cd "${srcdir}"/$pkgname-${pkgver}/build_unix diff --git a/core/db/db.install b/core/db/db.install deleted file mode 100644 index 03b64042d..000000000 --- a/core/db/db.install +++ /dev/null @@ -1,5 +0,0 @@ -post_upgrade() { - if [ "$(vercmp $2 5.1)" -lt 0 ]; then - echo " >> Major version update. Consider running db_upgrade on Berkeley DB databases." - fi -} diff --git a/core/dbus/PKGBUILD b/core/dbus/PKGBUILD index d61465f41..9d3daa0ef 100644 --- a/core/dbus/PKGBUILD +++ b/core/dbus/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 194433 2013-09-16 10:42:42Z jgc $ +# $Id: PKGBUILD 197807 2013-10-30 11:03:01Z allan $ # Maintainer: Tom Gundersen <teg@jklm.no> # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Link Dupont <link@subpop.net> # pkgname=dbus -pkgver=1.6.14 +pkgver=1.6.16 pkgrel=1 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" @@ -16,7 +16,6 @@ optdepends=('libx11: dbus-launch support') provides=('dbus-core') conflicts=('dbus-core') replaces=('dbus-core') -options=(!libtool) source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz 30-dbus systemd-user-session.patch) @@ -48,6 +47,6 @@ package(){ install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus/COPYING" } -md5sums=('1c22aebdf952e92908800f1ec2aeb0c4' +md5sums=('1de63d9983d7785836ffae6c2181c698' '3314d727fa57fc443fce25b5cbeebbcc' 'd8a1bd529b3ddca671ee1a695a143db9') diff --git a/core/dialog/PKGBUILD b/core/dialog/PKGBUILD index c0322bebd..01252795c 100644 --- a/core/dialog/PKGBUILD +++ b/core/dialog/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 195853 2013-10-02 13:25:41Z foutrelis $ +# $Id: PKGBUILD 197224 2013-10-24 09:07:05Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=dialog -pkgver=1.2_20131001 +pkgver=1.2_20130928 pkgrel=1 +epoch=1 pkgdesc="A tool to display dialog boxes from shell scripts" arch=('i686' 'x86_64' 'mips64el') url="http://invisible-island.net/dialog/" @@ -14,7 +15,7 @@ license=('LGPL2.1') depends=('ncurses') options=('staticlibs') source=(ftp://invisible-island.net/$pkgname/$pkgname-${pkgver/_/-}.tgz) -sha256sums=('b22215d56dfbfa7f025092759e8f144b17321e14829b2a273f68d745a1f0dca5') +sha256sums=('6fcf8daa50335e4d08da9f4f5ea5e1025efe84c3a719a56e871eb83ed0fd2b4c') build() { cd "$srcdir/$pkgname-${pkgver/_/-}" diff --git a/core/dmraid/PKGBUILD b/core/dmraid/PKGBUILD index 64564e85c..0747ebc40 100644 --- a/core/dmraid/PKGBUILD +++ b/core/dmraid/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186295 2013-05-24 07:56:32Z tpowa $ +# $Id: PKGBUILD 197790 2013-10-30 08:14:33Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> #Contributor: Urs Wolfer <uwolfer @ fwo.ch> pkgname=dmraid pkgver=1.0.0.rc16.3 -pkgrel=9 +pkgrel=10 pkgdesc="Device mapper RAID interface" url="http://people.redhat.com/~heinzm/sw/dmraid/" conflicts=('mkinitcpio<0.7') diff --git a/core/dosfstools/PKGBUILD b/core/dosfstools/PKGBUILD index bcab9740d..77e15652f 100644 --- a/core/dosfstools/PKGBUILD +++ b/core/dosfstools/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 191697 2013-07-29 09:44:27Z tpowa $ +# $Id: PKGBUILD 196781 2013-10-19 06:36:41Z tpowa $ # Maintainer: dorphell <dorphell@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=dosfstools -pkgver=3.0.22 +pkgver=3.0.23 pkgrel=1 pkgdesc="DOS filesystem utilities" arch=(i686 x86_64 'mips64el') @@ -10,7 +10,7 @@ depends=('glibc') source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) url="http://www.daniel-baumann.ch/software/dosfstools/" license=('GPL2') -md5sums=('301f01ca8a734011c0257134bcf475c8' +md5sums=('bfdca786880a7f1cc9ce8ac68cb1fd51' 'SKIP') build() { diff --git a/core/e2fsprogs/PKGBUILD b/core/e2fsprogs/PKGBUILD index 16ef05f87..2def1a4df 100644 --- a/core/e2fsprogs/PKGBUILD +++ b/core/e2fsprogs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 188851 2013-06-23 03:24:28Z foutrelis $ +# $Id: PKGBUILD 197436 2013-10-26 01:07:56Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=e2fsprogs pkgver=1.42.8 -pkgrel=1 +pkgrel=2 pkgdesc="Ext2/3/4 filesystem utilities" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'MIT') @@ -15,6 +15,7 @@ makedepends=('bc') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'MIT-LICENSE') backup=('etc/mke2fs.conf') +options=('staticlibs') install=${pkgname}.install sha1sums=('79cdb2374a9c0e68f01739598679db06d546b897' 'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb') @@ -42,6 +43,9 @@ package() { sed -i -e 's#^SS_DIR=.*#SS_DIR="/usr/share/ss"#' "${pkgdir}/usr/bin/mk_cmds" sed -i -e 's#^ET_DIR=.*#ET_DIR="/usr/share/et"#' "${pkgdir}/usr/bin/compile_et" + # remove static libraries with a shared counterpart + rm ${pkgdir}/usr/lib/lib{com_err,e2p,ext2fs,ss}.a + # install MIT license install -Dm644 "${srcdir}/MIT-LICENSE" \ "${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE" diff --git a/core/efibootmgr/PKGBUILD b/core/efibootmgr/PKGBUILD index 28cb02ea6..2a6515a72 100755 --- a/core/efibootmgr/PKGBUILD +++ b/core/efibootmgr/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 194435 2013-09-16 12:11:58Z tpowa $ +# $Id: PKGBUILD 197808 2013-10-30 11:03:08Z allan $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Murtuza Akhtari <inxsible at gmail dot com> # Contributor: Keshav Padram Amburay <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> @@ -17,7 +17,7 @@ url="https://github.com/vathpela/efibootmgr" license=('GPL2') makedepends=('git') depends=('pciutils' 'efivar' 'zlib') -options=('strip' 'zipman' '!emptydirs' '!libtool') +options=('strip' 'zipman' '!emptydirs') source=("${_gitname}::git+${_gitroot}#branch=${_gitbranch}") sha1sums=('SKIP') diff --git a/core/expat/PKGBUILD b/core/expat/PKGBUILD index bd0571dfa..18db4d2c3 100644 --- a/core/expat/PKGBUILD +++ b/core/expat/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 183047 2013-04-17 02:02:02Z allan $ +# $Id: PKGBUILD 197159 2013-10-23 13:04:23Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=expat pkgver=2.1.0 -pkgrel=2 +pkgrel=3 pkgdesc="An XML parser library" arch=('i686' 'x86_64' 'mips64el') url="http://expat.sourceforge.net/" license=('custom') depends=('glibc') -options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/expat/${pkgname}-${pkgver}.tar.gz) md5sums=('dd7dab7a5fea97d2a6a43f511449b7cd') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr #--mandir=/usr/share/man + ./configure --prefix=/usr make } diff --git a/core/fakeroot/PKGBUILD b/core/fakeroot/PKGBUILD index 254049c41..19330d06b 100644 --- a/core/fakeroot/PKGBUILD +++ b/core/fakeroot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 194710 2013-09-23 00:56:24Z allan $ +# $Id: PKGBUILD 197809 2013-10-30 11:03:15Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Jochem Kossen <j.kossen@home.nl> @@ -12,7 +12,6 @@ url="http://packages.debian.org/fakeroot" groups=('base-devel') install=fakeroot.install depends=('glibc' 'filesystem' 'sed' 'util-linux' 'sh') -options=('!libtool') source=(http://ftp.debian.org/debian/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.bz2) md5sums=('9777a81d4d1878422447a1d0030c1f9f') diff --git a/core/file/PKGBUILD b/core/file/PKGBUILD index ba6f0439f..175913607 100644 --- a/core/file/PKGBUILD +++ b/core/file/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 195182 2013-09-26 23:59:54Z allan $ +# $Id: PKGBUILD 197810 2013-10-30 11:03:22Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> @@ -11,7 +11,6 @@ license=('custom') groups=('base' 'base-devel') url="http://www.darwinsys.com/file/" depends=('glibc' 'zlib') -options=('!libtool') source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz) md5sums=('3f99565532f548d7540912c4642d1ede') diff --git a/core/flex/PKGBUILD b/core/flex/PKGBUILD index 2afb4187b..801252b58 100644 --- a/core/flex/PKGBUILD +++ b/core/flex/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164810 2012-08-06 13:29:17Z allan $ +# $Id: PKGBUILD 196829 2013-10-20 11:50:22Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> @@ -11,6 +11,7 @@ url="http://flex.sourceforge.net" license=('custom') groups=('base-devel') depends=('glibc' 'm4' 'sh') +options=('staticlibs') install=flex.install source=(http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.bz2 lex.sh) diff --git a/core/gawk/PKGBUILD b/core/gawk/PKGBUILD index 288e552d6..f7e45cfd8 100644 --- a/core/gawk/PKGBUILD +++ b/core/gawk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186293 2013-05-24 07:53:32Z tpowa $ +# $Id: PKGBUILD 197682 2013-10-28 10:54:43Z tpowa $ # Maintainer: # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=gawk pkgver=4.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="GNU version of awk" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/gawk/" diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index c6a0452bb..c6d78cabd 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193063 2013-08-15 12:08:11Z allan $ +# $Id: PKGBUILD 197286 2013-10-25 01:09:21Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -9,9 +9,9 @@ if [ "${CARCH}" != "mips64el" ]; then else pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc') fi -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=3 -_snapshot=4.8-20130725 +#_snapshot=4.8-20130725 pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL' 'custom') @@ -19,11 +19,11 @@ url="http://gcc.gnu.org" makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'doxygen') [[ "$CARCH" != "mips64el" ]] && makedepends+=('gcc-ada') checkdepends=('dejagnu' 'inetutils') -options=('!libtool' '!emptydirs') -source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2) - ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 +options=('!emptydirs') +source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 + #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 gcc-4.8-filename-output.patch) -md5sums=('e21f259bc4c44e61e19a780ad5badfeb' +md5sums=('a3d7d63b9cb6b6ea049469a0c4a43c9d' '40cb437805e2f7a006aa0d0c3098ab0f') if [ -n "${_snapshot}" ]; then @@ -158,6 +158,7 @@ package_gcc() pkgdesc="The GNU Compiler Collection - C and C++ frontends" depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.23' 'libmpc' 'cloog') groups=('base-devel') + options=('staticlibs') install=gcc.install cd ${srcdir}/gcc-build @@ -168,17 +169,21 @@ package_gcc() mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.18-gdb.py # unfortunately it is much, much easier to install the lot and clean-up the mess... - rm -f $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*} - rm -f $pkgdir/usr/lib/*.so* - rm -f $pkgdir/usr/lib/lib{atomic,gfortran,go{,begin},iberty,objc}.a - rm -f $pkgdir/usr/lib/libgfortran.spec - rm -rf $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc} - rm -f $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1} - rm -f $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{libcaf_single,libgfortranbegin}.a - rm -rf $pkgdir/usr/lib/go - rm -f $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.info - rm -f $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo - rm -f $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1 + rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*} + rm $pkgdir/usr/lib/*.so* + rm $pkgdir/usr/lib/lib{atomic,gfortran,go{,begin},iberty,objc}.a + rm $pkgdir/usr/lib/libgfortran.spec + rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc} + rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1} + rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{libcaf_single,libgfortranbegin}.a + rm -r $pkgdir/usr/lib/go + rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.info + rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo + rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1 + + # remove static libraries - note libstdc++.a is needed for the binutils and glibc testsuite + rm $pkgdir/usr/lib/lib{asan,gomp,itm,mudflap{,th},quadmath}.a + [[ $CARCH = "x86_64" ]] && rm $pkgdir/usr/lib/libtsan.a # many packages expect this symlinks ln -s gcc ${pkgdir}/usr/bin/cc @@ -226,6 +231,7 @@ package_gcc-fortran() { pkgdesc="Fortran front-end for GCC" depends=("gcc=$pkgver-$pkgrel") + options=('staticlibs' '!emptydirs') install=gcc-fortran.install cd ${srcdir}/gcc-build @@ -236,12 +242,13 @@ package_gcc-fortran() ln -s gfortran ${pkgdir}/usr/bin/f95 - # remove files included in gcc-libs or gcc - rm -f ${pkgdir}/usr/lib/lib{gfortran,gcc_s}.so* - rm -f ${pkgdir}/usr/lib/libquadmath.{a,so*} - rm -f ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/{*.o,libgc*} - rm -f ${pkgdir}/usr/share/info/libquadmath.info - rm -fr ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/include + # remove files included in gcc-libs or gcc and unnneeded static lib + rm ${pkgdir}/usr/lib/lib{gfortran,gcc_s}.so* + rm ${pkgdir}/usr/lib/libquadmath.{a,so*} + rm ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/{*.o,libgc*} + rm ${pkgdir}/usr/share/info/libquadmath.info + rm -r ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/include + rm ${pkgdir}/usr/lib/libgfortran.a # Install Runtime Library Exception install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \ @@ -272,6 +279,7 @@ package_gcc-ada() { pkgdesc="Ada front-end for GCC (GNAT)" depends=("gcc=$pkgver-$pkgrel") + options=('staticlibs' '!emptydirs') install=gcc-ada.install cd ${srcdir}/gcc-build/gcc @@ -279,7 +287,7 @@ package_gcc-ada() install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver ln -s gcc ${pkgdir}/usr/bin/gnatgcc - + # Install Runtime Library Exception install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \ ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION @@ -289,12 +297,14 @@ package_gcc-go() { pkgdesc="Go front-end for GCC" depends=("gcc=$pkgver-$pkgrel") + options=('staticlibs' '!emptydirs') install=gcc-go.install cd ${srcdir}/gcc-build make -j1 DESTDIR=$pkgdir install-target-libgo make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info} install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1 + rm $pkgdir/usr/lib/lib{atomic,go}.a # Install Runtime Library Exception install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \ diff --git a/core/gdbm/PKGBUILD b/core/gdbm/PKGBUILD index 71da45002..97e801b2d 100644 --- a/core/gdbm/PKGBUILD +++ b/core/gdbm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 195488 2013-10-01 06:09:23Z bpiotrowski $ +# $Id: PKGBUILD 197797 2013-10-30 10:37:51Z allan $ # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=gdbm pkgver=1.10 -pkgrel=2 +pkgrel=3 pkgdesc="GNU database library" url="http://www.gnu.org/software/gdbm/gdbm.html" license=('GPL') @@ -13,7 +13,7 @@ arch=('i686' 'x86_64' 'mips64el') depends=('glibc' 'sh') source=(ftp://ftp.gnu.org/gnu/gdbm/${pkgname}-${pkgver}.tar.gz gdbm-1.10-zeroheaders.patch) -options=('!libtool' '!makeflags') +options=('!makeflags') install=gdbm.install md5sums=('88770493c2559dc80b561293e39d3570' 'ac255b10452005237836cd2d3a470733') diff --git a/core/gettext/PKGBUILD b/core/gettext/PKGBUILD index 90731c03d..27a87056a 100644 --- a/core/gettext/PKGBUILD +++ b/core/gettext/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 193578 2013-08-24 12:17:50Z tpowa $ +# $Id: PKGBUILD 197811 2013-10-30 11:03:28Z allan $ # Maintainer: pkgname=gettext pkgver=0.18.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="GNU internationalization library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/gettext/" license=('GPL') groups=('base' 'base-devel') -depends=('gcc-libs' 'acl' 'sh' 'glib2') +depends=('gcc-libs' 'acl' 'sh' 'glib2' 'libunistring') optdepends=('cvs: for autopoint tool') -options=(!libtool !docs) +options=(!docs) install=gettext.install source=(ftp://ftp.gnu.org/pub/gnu/gettext/${pkgname}-${pkgver}.tar.gz{,.sig}) md5sums=('3fc808f7d25487fc72b5759df7419e02' diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD index dbe30c874..c460aa00f 100644 --- a/core/glib2/PKGBUILD +++ b/core/glib2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196009 2013-10-07 11:50:04Z jgc $ +# $Id: PKGBUILD 197812 2013-10-30 11:03:36Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=glib2 pkgname=(glib2 glib2-docs) -pkgver=2.38.0 +pkgver=2.38.1 pkgrel=1 pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" @@ -11,7 +11,7 @@ arch=(i686 x86_64 mips64el) makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'elfutils') source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz revert-warn-glib-compile-schemas.patch) -sha256sums=('7513a7de5e814ccb48206340a8773ea523d6a7bf04dc74565de69b899bc2ff32' +sha256sums=('01906c62ac666d2ab3183cc07261b2536fab7b211c6129ab66b119c2af56d159' '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') prepare() { @@ -37,7 +37,7 @@ package_glib2() { depends=('pcre' 'libffi') optdepends=('python2: for gdbus-codegen and gtester-report' 'elfutils: gresource inspection tool') - options=('!docs' '!libtool' '!emptydirs') + options=('!docs' '!emptydirs') license=('LGPL') cd glib-$pkgver diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index b77a6eaa5..76c4f5859 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,12 +1,14 @@ -# $Id: PKGBUILD 195163 2013-09-26 03:20:58Z allan $ +# $Id: PKGBUILD 197798 2013-10-30 10:37:54Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc # NOTE: valgrind requires rebuilt with each major glibc version +# NOTE: adjust version in install script when locale files are updated + pkgname=glibc pkgver=2.18 -pkgrel=5 +pkgrel=9 pkgdesc="GNU C Library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libc" @@ -17,13 +19,16 @@ makedepends=('gcc>=4.7') backup=(etc/gai.conf etc/locale.gen etc/nscd.conf) -options=('!strip') +options=('!strip' 'staticlibs') install=glibc.install source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig} + glibc-2.18-make-4.patch glibc-2.18-readdir_r-CVE-2013-4237.patch - glibc-2.18-malloc-corrupt-CVE-2013-4332.patch - glibc-2.18-strcoll-CVE-2012-4412+4424.patch - glibc-2.18-ptr-mangle-CVE-2013-4788.patch + glibc-2.18-malloc-corrupt-CVE-2013-4332.patch + glibc-2.18-strcoll-CVE-2012-4412+4424.patch + glibc-2.18-ptr-mangle-CVE-2013-4788.patch + glibc-2.18-getaddrinfo-CVE-2013-4458.patch + glibc-2.18-getaddrinfo-assertion.patch glibc-2.18-strstr-hackfix.patch nscd.service nscd.tmpfiles @@ -31,19 +36,25 @@ source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig} locale-gen) md5sums=('88fbbceafee809e82efd52efa1e3c58f' 'SKIP' + 'e1883c2d1b01ff73650db5f5bb5a5a52' '154da6bf5a5248f42a7bf5bf08e01a47' 'b79561ab9dce900e9bbeaf0d49927c2b' 'c7264b99d0f7e51922a4d3126182c40a' '9749ba386b08a8fe53e7ecede9bf2dfb' + '71329fccb8eb583fb0d67b55f1e8df68' + 'd4d86add33f22125777e0ecff06bc9bb' '4441f6dfe7d75ced1fa75e54dd21d36e' 'd5fab2cd3abea65aa5ae696ea4a47d6b' 'da662ca76e7c8d7efbc7986ab7acea2d' '07ac979b6ab5eeb778d55f041529d623' - '476e9113489f93b348b21e144b6a8fcf') + 'b5fd017036fb91199ee76f670da8c15b') prepare() { cd ${srcdir}/${pkgname}-${pkgver} - + + # compatibility with make-4.0 (submitted upstream) + patch -p1 -i $srcdir/glibc-2.18-make-4.patch + # upstream commit 91ce4085 patch -p1 -i $srcdir/glibc-2.18-readdir_r-CVE-2013-4237.patch @@ -51,13 +62,17 @@ prepare() { patch -p1 -i $srcdir/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch # upstream commits 1326ba1a, 141f3a77 and 303e567a - # https://sourceware.org/ml/libc-alpha/2013-08/msg00394.html - # https://sourceware.org/ml/libc-alpha/2013-08/msg00462.html patch -p1 -i $srcdir/glibc-2.18-strcoll-CVE-2012-4412+4424.patch # upstream commits c61b4d41 and 0b1f8e35 patch -p1 -i $srcdir/glibc-2.18-ptr-mangle-CVE-2013-4788.patch + # upstream commit 7cbcdb36 + patch -p1 -i $srcdir/glibc-2.18-getaddrinfo-CVE-2013-4458.patch + + # upstream commit 894f3f10 + patch -p1 -i $srcdir/glibc-2.18-getaddrinfo-assertion.patch + # hack fix for strstr issues on x86 patch -p1 -i $srcdir/glibc-2.18-strstr-hackfix.patch @@ -118,7 +133,7 @@ build() { check() { # Known to fail on mips64el. if [ "$CARCH" != "mips64el" ]; then - # bug to file - the linker commands need to be reordered + # the linker commands need to be reordered - fixed in 2.19 LDFLAGS=${LDFLAGS/--as-needed,/} cd ${srcdir}/glibc-build @@ -151,6 +166,10 @@ package() { sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \ ${srcdir}/glibc-${pkgver}/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen + # remove the static libraries that have a shared counterpart + # note: keep libc, libdl, libm, libpthread for binutils testsuite + rm $pkgdir/usr/lib/lib{anl,BrokenLocale,crypt,nsl,resolv,rt,util}.a + # Do not strip the following files for improved debugging support # ("improved" as in not breaking gdb and valgrind...): # ld-${pkgver}.so diff --git a/core/glibc/glibc-2.18-getaddrinfo-CVE-2013-4458.patch b/core/glibc/glibc-2.18-getaddrinfo-CVE-2013-4458.patch new file mode 100644 index 000000000..a7bc67c6f --- /dev/null +++ b/core/glibc/glibc-2.18-getaddrinfo-CVE-2013-4458.patch @@ -0,0 +1,41 @@ +diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c +index e6ce4cf..8ff74b4 100644 +--- a/sysdeps/posix/getaddrinfo.c ++++ b/sysdeps/posix/getaddrinfo.c +@@ -197,7 +197,22 @@ gaih_inet_serv (const char *servicename, const struct gaih_typeproto *tp, + &rc, &herrno, NULL, &localcanon)); \ + if (rc != ERANGE || herrno != NETDB_INTERNAL) \ + break; \ +- tmpbuf = extend_alloca (tmpbuf, tmpbuflen, 2 * tmpbuflen); \ ++ if (!malloc_tmpbuf && __libc_use_alloca (alloca_used + 2 * tmpbuflen)) \ ++ tmpbuf = extend_alloca_account (tmpbuf, tmpbuflen, 2 * tmpbuflen, \ ++ alloca_used); \ ++ else \ ++ { \ ++ char *newp = realloc (malloc_tmpbuf ? tmpbuf : NULL, \ ++ 2 * tmpbuflen); \ ++ if (newp == NULL) \ ++ { \ ++ result = -EAI_MEMORY; \ ++ goto free_and_return; \ ++ } \ ++ tmpbuf = newp; \ ++ malloc_tmpbuf = true; \ ++ tmpbuflen = 2 * tmpbuflen; \ ++ } \ + } \ + if (status == NSS_STATUS_SUCCESS && rc == 0) \ + h = &th; \ +@@ -209,7 +224,8 @@ gaih_inet_serv (const char *servicename, const struct gaih_typeproto *tp, + { \ + __set_h_errno (herrno); \ + _res.options |= old_res_options & RES_USE_INET6; \ +- return -EAI_SYSTEM; \ ++ result = -EAI_SYSTEM; \ ++ goto free_and_return; \ + } \ + if (herrno == TRY_AGAIN) \ + no_data = EAI_AGAIN; \ +-- +1.8.4.1 + diff --git a/core/glibc/glibc-2.18-getaddrinfo-assertion.patch b/core/glibc/glibc-2.18-getaddrinfo-assertion.patch new file mode 100644 index 000000000..2f1f7c694 --- /dev/null +++ b/core/glibc/glibc-2.18-getaddrinfo-assertion.patch @@ -0,0 +1,39 @@ +diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c +index 0f4b885..e6ce4cf 100644 +--- a/sysdeps/posix/getaddrinfo.c ++++ b/sysdeps/posix/getaddrinfo.c +@@ -1666,13 +1666,13 @@ rfc3484_sort (const void *p1, const void *p2, void *arg) + + /* Fill in the results in all the records. */ + for (int i = 0; i < src->nresults; ++i) +- if (src->results[i].index == a1_index) ++ if (a1_index != -1 && src->results[i].index == a1_index) + { + assert (src->results[i].native == -1 + || src->results[i].native == a1_native); + src->results[i].native = a1_native; + } +- else if (src->results[i].index == a2_index) ++ else if (a2_index != -1 && src->results[i].index == a2_index) + { + assert (src->results[i].native == -1 + || src->results[i].native == a2_native); +@@ -2532,7 +2532,14 @@ getaddrinfo (const char *name, const char *service, + tmp.addr[0] = 0; + tmp.addr[1] = 0; + tmp.addr[2] = htonl (0xffff); +- tmp.addr[3] = sinp->sin_addr.s_addr; ++ /* Special case for lo interface, the source address ++ being possibly different than the interface ++ address. */ ++ if ((ntohl(sinp->sin_addr.s_addr) & 0xff000000) ++ == 0x7f000000) ++ tmp.addr[3] = htonl(0x7f000001); ++ else ++ tmp.addr[3] = sinp->sin_addr.s_addr; + } + else + { +-- +1.8.4.1 + diff --git a/core/glibc/glibc-2.18-make-4.patch b/core/glibc/glibc-2.18-make-4.patch new file mode 100644 index 000000000..374933464 --- /dev/null +++ b/core/glibc/glibc-2.18-make-4.patch @@ -0,0 +1,45 @@ +From dc76f0c32dae689a08aa21a1d206d4cd62adb278 Mon Sep 17 00:00:00 2001 +From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> +Date: Thu, 10 Oct 2013 14:26:12 +0900 +Subject: [PATCH] configure: allow building with GNU Make 4 + +Currently, configure errors telling make 4 is too old +since it does not match our regexp. + +configure.in: allow GNU Make 4.* + +Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> +--- + configure | 2 +- + configure.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 5e2f4d0..e139bf0 100755 +--- a/configure ++++ b/configure +@@ -4761,7 +4761,7 @@ $as_echo_n "checking version of $MAKE... " >&6; } + ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; +- 3.79* | 3.[89]*) ++ 3.79* | 3.[89]* | 4.*) + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + +diff --git a/configure.in b/configure.in +index a7f9881..95c36b6 100644 +--- a/configure.in ++++ b/configure.in +@@ -984,7 +984,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v, + critic_missing="$critic_missing gcc") + AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version, + [GNU Make[^0-9]*\([0-9][0-9.]*\)], +- [3.79* | 3.[89]*], critic_missing="$critic_missing make") ++ [3.79* | 3.[89]* | 4.*], critic_missing="$critic_missing make") + + AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version, + [GNU gettext.* \([0-9]*\.[0-9.]*\)], +-- +1.8.4.1 + diff --git a/core/glibc/glibc.install b/core/glibc/glibc.install index f8147a6cf..6b405486e 100644 --- a/core/glibc/glibc.install +++ b/core/glibc/glibc.install @@ -3,7 +3,10 @@ filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11}) post_upgrade() { ldconfig -r . - locale-gen + + if [[ $(vercmp 2.18 $2) = 1 ]]; then + locale-gen + fi [[ -x usr/bin/install-info ]] || return 0 for file in ${filelist[@]}; do diff --git a/core/glibc/locale-gen b/core/glibc/locale-gen index 5aff344c4..51191f810 100755 --- a/core/glibc/locale-gen +++ b/core/glibc/locale-gen @@ -4,39 +4,53 @@ set -e LOCALEGEN=/etc/locale.gen LOCALES=/usr/share/i18n/locales -if [ -n "$POSIXLY_CORRECT" ]; then - unset POSIXLY_CORRECT -fi +unset POSIXLY_CORRECT - -[ -f $LOCALEGEN -a -s $LOCALEGEN ] || exit 0; +[ -s "$LOCALEGEN" ] || exit 0 # Remove all old locale dir and locale-archive before generating new # locale data. -rm -rf /usr/lib/locale/* || true +rm -rf /usr/lib/locale/* umask 022 -is_entry_ok() { - if [ -n "$locale" -a -n "$charset" ] ; then - true - else - echo "error: Bad entry '$locale $charset'" - false - fi +gen() { + local locale=$1 + local charset=$2 + local input= + + if [ -z "$locale" ] || [ -z "$charset" ]; then + echo "error: Bad entry '$locale $charset'" + return + fi + + printf ' %s.%s\n' "$(echo "$locale" | sed 's/\([^.\@]*\).*/\1/')" "$charset" + + if [ -f "$LOCALES/$locale" ]; then + input=$locale + else + input=$(echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/') + fi + + localedef -i "$input" -c -f "$charset" -A /usr/share/locale/locale.alias "$locale" } +maxjobs=$(grep -c processor /proc/cpuinfo 2>/dev/null || echo 1) echo "Generating locales..." while read locale charset; do \ - case $locale in \#*) continue;; "") continue;; esac; \ - is_entry_ok || continue - echo -n " `echo $locale | sed 's/\([^.\@]*\).*/\1/'`"; \ - echo -n ".$charset"; \ - echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \ - echo -n '...'; \ - if [ -f $LOCALES/$locale ]; then input=$locale; else \ - input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; fi; \ - localedef -i $input -c -f $charset -A /usr/share/locale/locale.alias $locale; \ - echo ' done'; \ + case $locale in + \#*|'') + continue + ;; + esac + gen "$locale" "$charset" & + + # keep no more than $maxjobs jobs in flight + while [ $(jobs | wc -l) -ge $maxjobs ]; do + sleep 0.25 + jobs >/dev/null + done done < $LOCALEGEN +wait + echo "Generation complete." diff --git a/core/gmp/PKGBUILD b/core/gmp/PKGBUILD index f8bff89b0..f19fa68be 100644 --- a/core/gmp/PKGBUILD +++ b/core/gmp/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 195874 2013-10-03 04:29:19Z allan $ +# $Id: PKGBUILD 197162 2013-10-23 13:04:59Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gmp pkgver=5.1.3 -pkgrel=1 +pkgrel=2 pkgdesc="A free library for arbitrary precision arithmetic" arch=('i686' 'x86_64' 'mips64el') url="http://gmplib.org/" depends=('gcc-libs' 'sh') license=('LGPL3') -options=('!libtool') install=gmp.install source=(ftp://ftp.gmplib.org/pub/gmp-${pkgver}/gmp-${pkgver}.tar.xz{,.sig}) md5sums=('e5fe367801ff067b923d1e6a126448aa' diff --git a/core/gpgme/PKGBUILD b/core/gpgme/PKGBUILD index f56856153..00d418785 100644 --- a/core/gpgme/PKGBUILD +++ b/core/gpgme/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193205 2013-08-19 07:48:04Z tpowa $ +# $Id: PKGBUILD 197813 2013-10-30 11:03:42Z allan $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Sarah Hay <sarah@archlinux.org> @@ -12,7 +12,7 @@ url="http://www.gnupg.org/related_software/gpgme/" license=('GPL') depends=('libgpg-error' 'pth' 'gnupg>=2') install=${pkgname}.install -options=('!libtool' '!emptydirs') +options=('!emptydirs') source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}) md5sums=('334e524cffa8af4e2f43ae8afe585672' 'SKIP') diff --git a/core/gpm/PKGBUILD b/core/gpm/PKGBUILD index 5c5e106c5..0bc6550b2 100644 --- a/core/gpm/PKGBUILD +++ b/core/gpm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186057 2013-05-20 18:53:27Z eric $ +# $Id: PKGBUILD 197717 2013-10-28 22:26:50Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gpm pkgver=1.20.7 -pkgrel=3 +pkgrel=4 pkgdesc="A mouse server for the console and xterm" arch=('i686' 'x86_64' 'mips64el') url="http://www.nico.schottelius.org/software/gpm/" diff --git a/core/grep/PKGBUILD b/core/grep/PKGBUILD index 5c37c9bd7..caabdfaa2 100644 --- a/core/grep/PKGBUILD +++ b/core/grep/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 176245 2013-01-28 00:29:23Z allan $ +# $Id: PKGBUILD 197799 2013-10-30 10:37:55Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=grep -pkgver=2.14 -pkgrel=2 +pkgver=2.15 +pkgrel=1 pkgdesc="A string search utility" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') @@ -14,8 +14,8 @@ depends=('glibc' 'pcre' 'sh') makedepends=('texinfo') install=${pkgname}.install source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) -md5sums=('d4a3f03849d1e17ce56ab76aa5a24cab' - 'b94fdcaa058b47a9a25099c26cd2e4c3') +md5sums=('8cab8ca52bcae735af40278423c7c942' + 'SKIP') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD index 3fba35fe2..13c9a2c90 100644 --- a/core/iptables/PKGBUILD +++ b/core/iptables/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187030 2013-06-03 11:15:14Z allan $ +# $Id: PKGBUILD 197814 2013-10-30 11:03:50Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> @@ -12,7 +12,6 @@ url='http://www.netfilter.org/projects/iptables/index.html' depends=('glibc' 'bash') makedepends=('linux-api-headers') backup=('etc/xtables/connlabel.conf') -options=('!libtool') source=(http://www.netfilter.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2{,.sig} empty.rules simple_firewall.rules diff --git a/core/isl/PKGBUILD b/core/isl/PKGBUILD index 5e04bcfa8..9a8b1224c 100644 --- a/core/isl/PKGBUILD +++ b/core/isl/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 193525 2013-08-22 05:37:20Z allan $ +# $Id: PKGBUILD 197163 2013-10-23 13:05:00Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> pkgname=isl pkgver=0.12.1 -pkgrel=1 +pkgrel=2 pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints" arch=('i686' 'x86_64' 'mips64el') url="http://freecode.com/projects/isl" depends=('gmp') license=('MIT') -options=('!libtool') source=(ftp://ftp.linux.student.kuleuven.be/pub/people/skimo/isl/$pkgname-$pkgver.tar.bz2) md5sums=('27d381085ff1b5733c3e8a9b6ad24a4d') diff --git a/core/keyutils/PKGBUILD b/core/keyutils/PKGBUILD index 3bfd63f4b..37ae8968e 100644 --- a/core/keyutils/PKGBUILD +++ b/core/keyutils/PKGBUILD @@ -1,32 +1,32 @@ -# $Id: PKGBUILD 186780 2013-05-31 07:19:13Z tpowa $ +# $Id: PKGBUILD 198652 2013-11-01 13:53:34Z eric $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=keyutils -pkgver=1.5.5 -pkgrel=5 +pkgver=1.5.8 +pkgrel=1 pkgdesc="Linux Key Management Utilities" arch=(i686 x86_64 'mips64el') url="http://www.kernel.org" license=('GPL2' 'LGPL2.1') depends=('glibc' 'sh') -backup=(etc/request-key.conf) +backup=('etc/request-key.conf') source=(http://people.redhat.com/~dhowells/${pkgname}/${pkgname}-${pkgver}.tar.bz2 -request-key.conf.patch) -md5sums=('d759680b2f23c99af95938f5026f25fb' + request-key.conf.patch) +md5sums=('3c7f463039b83833c12a9414c2fcb389' '89a819a7e4e90936b210c9d5020d296d') prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} # fix paths of binaries in /etc/request-key.conf patch -Np0 -i ../request-key.conf.patch } build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" SBINDIR='/usr/bin' BINDIR='/usr/bin' } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" SBINDIR='/usr/bin' BINDIR='/usr/bin' LIBDIR='/usr/lib' USRLIBDIR='/usr/lib' install } diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD index 71911ca48..2cc64e971 100644 --- a/core/kmod/PKGBUILD +++ b/core/kmod/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193604 2013-08-25 14:43:28Z dreisner $ +# $Id: PKGBUILD 197816 2013-10-30 11:04:03Z allan $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=kmod @@ -10,7 +10,6 @@ url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary' license=('GPL2') depends=('glibc' 'zlib') makedepends=('gtk-doc') -options=('!libtool') provides=('module-init-tools=3.16' 'libkmod.so') conflicts=('module-init-tools') replaces=('module-init-tools') diff --git a/core/ldns/PKGBUILD b/core/ldns/PKGBUILD index 44607652a..98ac36415 100644 --- a/core/ldns/PKGBUILD +++ b/core/ldns/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 171551 2012-11-19 03:55:29Z bisson $ +# $Id: PKGBUILD 197817 2013-10-30 11:04:09Z allan $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: mathieui <mathieui@mathieui.net> # Contributor: jiribb <jiribb@gmail.com> @@ -10,7 +10,6 @@ pkgdesc='Fast DNS library supporting recent RFCs' url='http://www.nlnetlabs.nl/projects/ldns/' license=('custom:BSD') arch=('i686' 'x86_64' 'mips64el') -options=('!libtool') depends=('openssl' 'dnssec-anchors') optdepends=('libpcap: ldns-dpa tool') makedepends=('libpcap') diff --git a/core/libarchive/PKGBUILD b/core/libarchive/PKGBUILD index 44931f986..cfd07fac2 100644 --- a/core/libarchive/PKGBUILD +++ b/core/libarchive/PKGBUILD @@ -1,20 +1,23 @@ -# $Id: PKGBUILD 193605 2013-08-25 14:43:38Z dreisner $ +# $Id: PKGBUILD 197256 2013-10-24 19:47:22Z dreisner $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=libarchive pkgver=3.1.2 -pkgrel=2 +pkgrel=4 pkgdesc="library that can create and read several streaming archive formats" arch=('i686' 'x86_64' 'mips64el') url="http://libarchive.org/" license=('BSD') depends=('acl' 'attr' 'bzip2' 'expat' 'lzo2' 'openssl' 'xz' 'zlib') +options=('strip' 'debug' 'libtool') provides=('libarchive.so') source=("http://libarchive.org/downloads/$pkgname-$pkgver.tar.gz" '0001-mtree-fix-line-filename-length-calculation.patch' + https://github.com/libarchive/libarchive/commit/22531545514043e04633e1c015c7540b9de9dbe4.patch 'libarchive-3.1.2-acl.patch') md5sums=('efad5a503f66329bb9d2f4308b5de98a' 'fda89c145bbcd793a96b06b463ef6a72' + '6432f3360abd5645461a9c825c75b307' 'a5c995661c62429ceff2c23ea322393b') build() { @@ -27,6 +30,9 @@ build() { # https://code.google.com/p/libarchive/issues/detail?id=329 patch -Np1 -i "$srcdir/libarchive-3.1.2-acl.patch" + # CVE-2013-0211 + patch -Np1 -i "$srcdir/22531545514043e04633e1c015c7540b9de9dbe4.patch" + ./configure --prefix=/usr --without-xml2 make } diff --git a/core/libassuan/PKGBUILD b/core/libassuan/PKGBUILD index 86047c79b..a3c8709d6 100644 --- a/core/libassuan/PKGBUILD +++ b/core/libassuan/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189897 2013-07-11 06:27:54Z tpowa $ +# $Id: PKGBUILD 197818 2013-10-30 11:04:17Z allan $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=libassuan @@ -9,7 +9,6 @@ arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.gnupg.org/related_software/libassuan" depends=('libgpg-error') -options=('!libtool') source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2) install=libassuan.install md5sums=('757243cc4a71b30ed8d8dbe784035d36') diff --git a/core/libedit/PKGBUILD b/core/libedit/PKGBUILD index 3e51cfdb5..fa676f1a8 100644 --- a/core/libedit/PKGBUILD +++ b/core/libedit/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187329 2013-06-05 12:52:10Z bisson $ +# $Id: PKGBUILD 197819 2013-10-30 11:04:23Z allan $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Roman Cheplyaka <roma@ro-che.info> @@ -11,7 +11,6 @@ url='http://www.thrysoee.dk/editline/' arch=('i686' 'x86_64' 'mips64el') license=('BSD') depends=('ncurses') -options=('!libtool') source=("http://www.thrysoee.dk/editline/libedit-${pkgver/_/-}.tar.gz") sha1sums=('9c3fe7af5ba3d86c608872de3d6e8179add8cc88') diff --git a/core/libevent/PKGBUILD b/core/libevent/PKGBUILD index 4dd3967a6..4b4119908 100644 --- a/core/libevent/PKGBUILD +++ b/core/libevent/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 177868 2013-02-10 13:06:19Z tomegun $ +# $Id: PKGBUILD 197437 2013-10-26 01:07:57Z allan $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Judd <jvinet@zeroflux.org> pkgname=libevent pkgver=2.0.21 -pkgrel=2 +pkgrel=3 pkgdesc="An event notification library" arch=('i686' 'x86_64' 'mips64el') url="http://www.monkey.org/~provos/libevent/" license=('BSD') depends=('openssl') optdepends=('python2: to use event_rpcgen.py') -options=('!libtool') source=(https://github.com/downloads/${pkgname}/${pkgname}/${pkgname}-$pkgver-stable.tar.gz{,.asc}) build() { diff --git a/core/libffi/PKGBUILD b/core/libffi/PKGBUILD index ffdcc73a9..ea0981e35 100644 --- a/core/libffi/PKGBUILD +++ b/core/libffi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 195482 2013-10-01 05:58:29Z bpiotrowski $ +# $Id: PKGBUILD 197820 2013-10-30 11:04:33Z allan $ # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> @@ -11,7 +11,6 @@ url="http://sourceware.org/libffi/" license=('MIT') depends=('glibc') checkdepends=('dejagnu') -options=('!libtool') install=libffi.install source=(ftp://sourceware.org/pub/libffi/libffi-${pkgver}.tar.gz) sha1sums=('f5230890dc0be42fb5c58fbf793da253155de106') diff --git a/core/libgcrypt/PKGBUILD b/core/libgcrypt/PKGBUILD index 74af6846c..5028378bf 100644 --- a/core/libgcrypt/PKGBUILD +++ b/core/libgcrypt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 191717 2013-07-29 14:03:23Z andyrtr $ +# $Id: PKGBUILD 197821 2013-10-30 11:04:40Z allan $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=libgcrypt @@ -9,7 +9,7 @@ arch=(i686 x86_64 'mips64el') url="http://www.gnupg.org" license=('LGPL') depends=('libgpg-error>=1.10-2') -options=('!libtool' '!emptydirs') +options=('!emptydirs') install=$pkgname.install source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2 #ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgcrypt/${pkgname}-${pkgver}.tar.bz2 diff --git a/core/libgpg-error/PKGBUILD b/core/libgpg-error/PKGBUILD index b83b425bb..a0f491857 100644 --- a/core/libgpg-error/PKGBUILD +++ b/core/libgpg-error/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189754 2013-07-07 09:05:18Z andyrtr $ +# $Id: PKGBUILD 197822 2013-10-30 11:04:47Z allan $ # Maintainer: judd <jvinet@zeroflux.org> pkgname=libgpg-error @@ -9,7 +9,6 @@ arch=(i686 x86_64 'mips64el') url="http://www.gnupg.org" license=('LGPL') depends=('glibc' 'sh') -options=(!libtool) source=(ftp://ftp.gnupg.org/gcrypt/libgpg-error/${pkgname}-${pkgver}.tar.bz2{,.sig}) #ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgpg-error/${pkgname}-${pkgver}.tar.bz2) sha1sums=('259f359cd1440b21840c3a78e852afd549c709b8' diff --git a/core/libgssglue/PKGBUILD b/core/libgssglue/PKGBUILD index 4ef5b8d41..c7277e32e 100644 --- a/core/libgssglue/PKGBUILD +++ b/core/libgssglue/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165600 2012-08-27 07:54:23Z tomegun $ +# $Id: PKGBUILD 197800 2013-10-30 10:37:56Z allan $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=libgssglue pkgver=0.4 -pkgrel=1 +pkgrel=2 pkgdesc="Exports a gssapi interface which calls other random gssapi libraries" arch=('i686' 'x86_64' 'mips64el') url="http://www.citi.umich.edu/projects/nfsv4/linux/" @@ -12,7 +12,6 @@ license=('BSD') depends=('glibc') makedepends=('pkgconfig' 'autoconf') backup=(etc/gssapi_mech.conf) -options=('!libtool') source=(http://www.citi.umich.edu/projects/nfsv4/linux/$pkgname/$pkgname-$pkgver.tar.gz gssapi_mech.conf) diff --git a/core/libksba/PKGBUILD b/core/libksba/PKGBUILD index 8271eaff2..ef9a6d03f 100644 --- a/core/libksba/PKGBUILD +++ b/core/libksba/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183487 2013-04-22 09:10:14Z tpowa $ +# $Id: PKGBUILD 197823 2013-10-30 11:04:53Z allan $ # Maintainer: # Contributor: Damir Perisa <damir.perisa@bluewin.ch> @@ -11,7 +11,6 @@ license=('GPL') url="ftp://ftp.gnupg.org/gcrypt/alpha/libksba" depends=('bash' 'libgpg-error' 'glibc') source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2) -options=(!libtool) install=libksba.install build() { diff --git a/core/libmpc/PKGBUILD b/core/libmpc/PKGBUILD index 9862a825e..535e95513 100644 --- a/core/libmpc/PKGBUILD +++ b/core/libmpc/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 166514 2012-09-09 07:34:43Z allan $ +# $Id: PKGBUILD 197164 2013-10-23 13:05:01Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> pkgname=libmpc pkgver=1.0.1 -pkgrel=1.1 +pkgrel=2 pkgdesc="Library for the arithmetic of complex numbers with arbitrarily high precision" arch=('i686' 'x86_64' 'mips64el') url="http://www.multiprecision.org/" license=('LGPL') -depends=('mpfr>=3.0.0') -options=('!libtool') +depends=('mpfr') install=libmpc.install source=(http://www.multiprecision.org/mpc/download/mpc-${pkgver/_/-}.tar.gz{,.sig}) md5sums=('b32a2e1a3daa392372fbd586d1ed3679' diff --git a/core/libnl/PKGBUILD b/core/libnl/PKGBUILD index 7cd99eb0a..f70db147a 100644 --- a/core/libnl/PKGBUILD +++ b/core/libnl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189873 2013-07-10 08:18:16Z thomas $ +# $Id: PKGBUILD 197824 2013-10-30 11:05:01Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=libnl @@ -10,7 +10,6 @@ url="http://www.infradead.org/~tgr/libnl/" license=(GPL) depends=(glibc) backup=(etc/libnl/classid etc/libnl/pktloc) -options=(!libtool) source=("$url/files/$pkgname-$pkgver.tar.gz") sha256sums=('c7c5f267dfeae0c1a530bf96b71fb7c8dbbb07d54beef49b6712d8d6166f629b') diff --git a/core/libpipeline/PKGBUILD b/core/libpipeline/PKGBUILD index 1116f7fea..cfefe2e16 100644 --- a/core/libpipeline/PKGBUILD +++ b/core/libpipeline/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188248 2013-06-13 13:32:04Z andyrtr $ +# $Id: PKGBUILD 197825 2013-10-30 11:05:08Z allan $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=libpipeline @@ -9,7 +9,6 @@ arch=('i686' 'x86_64' 'mips64el') url="http://libpipeline.nongnu.org/" license=('GPL') depends=('glibc') -options=('!libtool') source=(http://download.savannah.gnu.org/releases/libpipeline/$pkgname-$pkgver.tar.gz{,.sig}) md5sums=('a98b07f6f487fa268d1ebd99806b85ff' 'SKIP') diff --git a/core/librpcsecgss/PKGBUILD b/core/librpcsecgss/PKGBUILD index 0547d6416..86ba947a2 100644 --- a/core/librpcsecgss/PKGBUILD +++ b/core/librpcsecgss/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 142792 2011-11-15 09:00:03Z tpowa $ +# $Id: PKGBUILD 197826 2013-10-30 11:05:14Z allan $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Andrew Krawchyk <krawch_a@denison.edu>, Marco Lima <cipparello gmail com> pkgname=librpcsecgss pkgver=0.19 -pkgrel=7.1 +pkgrel=8 pkgdesc="Library for RPCSECGSS support" arch=('i686' 'x86_64' 'mips64el') url="http://www.citi.umich.edu/projects/nfsv4/linux/" license=('GPL') depends=('glibc' 'krb5' 'libgssglue') makedepends=('pkg-config' 'autoconf') -options=('!libtool') source=("http://www.citi.umich.edu/projects/nfsv4/linux/${pkgname}/${pkgname}-${pkgver}.tar.gz") md5sums=('b45ed565bdc3099023aa35830ec92997') diff --git a/core/libsasl/PKGBUILD b/core/libsasl/PKGBUILD index 47e20bf0a..3632f77fc 100644 --- a/core/libsasl/PKGBUILD +++ b/core/libsasl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 195994 2013-10-07 10:32:39Z jgc $ +# $Id: PKGBUILD 197827 2013-10-30 11:05:21Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # This package spans multiple repositories. @@ -13,7 +13,7 @@ pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('i686' 'x86_64' 'mips64el') url="http://cyrusimap.web.cmu.edu/" license=('custom') -options=('!makeflags' '!libtool') +options=('!makeflags') makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl' 'sqlite2') source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz cyrus-sasl-2.1.22-qa.patch diff --git a/core/libssh2/PKGBUILD b/core/libssh2/PKGBUILD index 4df093749..6b90eecb7 100644 --- a/core/libssh2/PKGBUILD +++ b/core/libssh2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 173038 2012-12-09 15:23:11Z dreisner $ +# $Id: PKGBUILD 198760 2013-11-03 13:49:40Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -7,7 +7,7 @@ pkgname=libssh2 pkgver=1.4.3 -pkgrel=1 +pkgrel=2 pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts" url="http://www.libssh2.org/" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,6 @@ license=('BSD') depends=('openssl') makedepends=('zlib') provides=('libssh2.so') -options=('!libtool') source=("http://www.libssh2.org/download/$pkgname-$pkgver.tar.gz"{,.asc}) md5sums=('071004c60c5d6f90354ad1b701013a0b' 'bd01eca1e58c15233d69dae411dd2656') diff --git a/core/libtirpc/PKGBUILD b/core/libtirpc/PKGBUILD index fb70c3cc8..b88305735 100644 --- a/core/libtirpc/PKGBUILD +++ b/core/libtirpc/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 185038 2013-05-10 16:21:42Z tomegun $ +# $Id: PKGBUILD 197801 2013-10-30 10:37:59Z allan $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=libtirpc pkgver=0.2.3 -pkgrel=1 +pkgrel=2 pkgdesc="Transport Independent RPC library (SunRPC replacement)" arch=(i686 x86_64 mips64el) url="http://libtirpc.sourceforge.net/" license=('BSD') depends=('libgssglue') backup=('etc/netconfig') -options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/libtirpc/${pkgname}-${pkgver}.tar.bz2 libtirpc-build.patch) diff --git a/core/libtool/PKGBUILD b/core/libtool/PKGBUILD index 53ca4d00e..5f916f86d 100644 --- a/core/libtool/PKGBUILD +++ b/core/libtool/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188783 2013-06-20 06:35:11Z allan $ +# $Id: PKGBUILD 197158 2013-10-23 13:04:23Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> @@ -6,13 +6,13 @@ pkgname=('libtool' 'libltdl') pkgver=2.4.2 -pkgrel=10 +_gccver=4.8.2 +pkgrel=12 pkgdesc="A generic library support script" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libtool" license=('GPL') -makedepends=('gcc=4.8.1') -options=('!libtool') +makedepends=("gcc=${_gccver}") source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz{,.sig} nopic.patch) md5sums=('2ec8997e0c07249eb4cbd072417d70fe' @@ -35,7 +35,7 @@ check() { } package_libtool() { - depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.8.1') + depends=('sh' "libltdl=$pkgver" 'tar' "gcc=${_gccver}") groups=('base-devel') install=libtool.install @@ -43,7 +43,7 @@ package_libtool() { make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \ install-data-local - rm -rf ${pkgdir}/usr/share/libtool/libltdl/ + rm -r ${pkgdir}/usr/share/libtool/libltdl/ } package_libltdl() { @@ -52,5 +52,5 @@ package_libltdl() { cd ${srcdir}/${pkgbase}-${pkgver} make DESTDIR=${pkgdir} install-libLTLIBRARIES install-includeHEADERS \ install-ltdlincludeHEADERS install-data-local - rm -rf ${pkgdir}/usr/share/{aclocal,libtool/config} + rm -r ${pkgdir}/usr/share/{aclocal,libtool/config} } diff --git a/core/libusbx/PKGBUILD b/core/libusbx/PKGBUILD index a708fc92c..78f874dd4 100644 --- a/core/libusbx/PKGBUILD +++ b/core/libusbx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 194438 2013-09-16 12:13:08Z tpowa $ +# $Id: PKGBUILD 197829 2013-10-30 11:05:34Z allan $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=libusbx pkgver=1.0.17 @@ -9,7 +9,6 @@ arch=(i686 x86_64 mips64el) url="http://libusbx.org" license=('LGPL') source=(http://downloads.sourceforge.net/${pkgname}/releases/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -options=(!libtool) replaces=('libusb1' 'libusb') provides=("libusb=$pkgver") conflicts=("libusb") diff --git a/core/linux-atm/PKGBUILD b/core/linux-atm/PKGBUILD index a14393a05..7d171ef97 100644 --- a/core/linux-atm/PKGBUILD +++ b/core/linux-atm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186297 2013-05-24 07:57:23Z tpowa $ +# $Id: PKGBUILD 197830 2013-10-30 11:05:41Z allan $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Surain Mallawa Arachchi <mas@crc32.net> pkgname=linux-atm pkgver=2.5.2 -pkgrel=3 +pkgrel=4 pkgdesc="Drivers and tools to support ATM networking under Linux." arch=('i686' 'x86_64' 'mips64el') depends=('glibc') @@ -12,7 +12,7 @@ url="http://linux-atm.sourceforge.net/" license=(GPL) source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz man-pages.patch) -options=(!libtool !makeflags) +options=(!makeflags) md5sums=('d49499368c3cf15f73a05d9bce8824a8' '181390736336cdb615ae32f1ae5acfa6') diff --git a/core/logrotate/PKGBUILD b/core/logrotate/PKGBUILD index 8066904f1..49702e089 100644 --- a/core/logrotate/PKGBUILD +++ b/core/logrotate/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 192722 2013-08-14 17:32:14Z pierre $ +# $Id: PKGBUILD 196792 2013-10-19 09:14:49Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=logrotate -pkgver=3.8.6 +pkgver=3.8.7 pkgrel=1 pkgdesc="Rotates system logs automatically" arch=('i686' 'x86_64' 'mips64el') @@ -16,10 +16,10 @@ source=("https://fedorahosted.org/releases/l/o/logrotate/logrotate-${pkgver}.tar 'paths.patch' 'logrotate.conf' 'logrotate.cron.daily') -md5sums=('cd0082bbd7248e627ec659f2442fcdf9' +md5sums=('99e08503ef24c3e2e3ff74cc5f3be213' 'e76526bcd6fc33c9d921e1cb1eff1ffb' '86209d257c8b8bc0ae34d6f6ef057c0f' - '3909380f8a55fa160f62ed976a8bef4b') + 'dd5fd26724274fd9c827eadad60ff4c5') build() { cd "$srcdir/${pkgname}-${pkgver}" diff --git a/core/logrotate/logrotate.cron.daily b/core/logrotate/logrotate.cron.daily index 37d9e534c..11fe09c52 100755 --- a/core/logrotate/logrotate.cron.daily +++ b/core/logrotate/logrotate.cron.daily @@ -16,7 +16,11 @@ if [ -x /usr/bin/nice ]; then fi if [ -x /usr/bin/ionice ]; then - CMD_LOGROTATE="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${CMD_LOGROTATE}" + IONICE_CMD="/usr/bin/ionice -c ${IONICE_CLASS:-2}" + if [ $IONICE_CLASS -ne 3 ]; then + IONICE_CMD="${IONICE_CMD} -n ${IONICE_PRIORITY:-7}" + fi + CMD_LOGROTATE="${IONICE_CMD} ${CMD_LOGROTATE}" fi ${CMD_LOGROTATE} diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD index 9cc0623f8..6da781f60 100644 --- a/core/lvm2/PKGBUILD +++ b/core/lvm2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 196179 2013-10-07 23:45:54Z thomas $ +# $Id: PKGBUILD 197750 2013-10-29 09:58:36Z thomas $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') pkgver=2.02.103 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://sourceware.org/lvm2/" license=('GPL2' 'LGPL2.1') @@ -31,7 +31,7 @@ sha1sums=('1194babd8d3cd5a9620bec1fe98a3be060465daf' 'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4' '01782ce8e10718c1513e3906b126f30f682f5cab' '1d56f47a81350ae37ffbf61ee036fe31f4c5d504' - 'adf26f5e5636de9c055b2ac3b179641a543a8937' + 'aad90fce0e12eda41d38571d8eb27c5d5a8c59ec' 'f857a4a63fcc604a981e56875edda91767d4f1bf' 'fcfc265e3b10294cc4b10949a342e9db4310b186') diff --git a/core/lvm2/lvm-monitoring.service b/core/lvm2/lvm-monitoring.service index 138e91a08..14b2d1dee 100644 --- a/core/lvm2/lvm-monitoring.service +++ b/core/lvm2/lvm-monitoring.service @@ -2,8 +2,7 @@ Description=Monitoring of LVM2 mirrors, snapshots etc. using dmeventd or progress polling Documentation=man:dmeventd(8) man:lvcreate(8) man:lvchange(8) man:vgchange(8) Requires=dmeventd.socket -After=dmeventd.socket lvmetad.socket lvmetad.service dmeventd.service -Before=local-fs-pre.target +After=dmeventd.socket lvmetad.socket DefaultDependencies=no Conflicts=shutdown.target diff --git a/core/lzo2/PKGBUILD b/core/lzo2/PKGBUILD index e4632a529..a4d341ce3 100644 --- a/core/lzo2/PKGBUILD +++ b/core/lzo2/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 136471 2011-08-30 06:25:43Z tpowa $ +# $Id: PKGBUILD 197831 2013-10-30 11:05:49Z allan $ # Contributor: Low Kian Seong <fastmail_low@speedymail.org> # Maintainer: dorphell <dorphell@archlinux.org> pkgname=lzo2 pkgver=2.06 -pkgrel=1.1 +pkgrel=3 pkgdesc="Portable lossless data compression library" arch=('i686' 'x86_64' 'mips64el') url="http://www.oberhumer.com/opensource/lzo" license=('GPL') depends=('glibc') source=(http://www.oberhumer.com/opensource/lzo/download/lzo-${pkgver}.tar.gz) -options=(!libtool) md5sums=('95380bd4081f85ef08c5209f4107e9f8') build() { @@ -21,7 +20,13 @@ build() { # build minilzo gcc $CFLAGS -fpic -Iinclude/lzo -o minilzo/minilzo.o -c minilzo/minilzo.c - gcc -g -shared -o libminilzo.so.0 -Wl,-soname,libminilzo.so.0 minilzo/minilzo.o + gcc $LDFLAGS -shared -o libminilzo.so.0 -Wl,-soname,libminilzo.so.0 minilzo/minilzo.o +} + +check() { + cd "${srcdir}/lzo-${pkgver}" + make test # Larger test + make check } package() { diff --git a/core/make/PKGBUILD b/core/make/PKGBUILD index 9d6a8660a..ffe4143ca 100644 --- a/core/make/PKGBUILD +++ b/core/make/PKGBUILD @@ -1,54 +1,23 @@ -# $Id: PKGBUILD 189479 2013-07-03 10:09:10Z allan $ +# $Id: PKGBUILD 196827 2013-10-20 11:42:36Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=make -pkgver=3.82 -pkgrel=6 +pkgver=4.0 +pkgrel=1 pkgdesc="GNU make utility to maintain groups of programs" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/make" license=('GPL3') groups=('base-devel') -depends=('glibc' 'sh') +depends=('glibc' 'sh' 'guile') install=$pkgname.install -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig} - make-3.82-bug30612.patch - make-3.82-bug30723.patch - make-3.82-sort-blank.patch - make-3.82-makeflags.patch - make-3.82-expensive_glob.patch - make-3.82-dont-prune-intermediate.patch) -md5sums=('1a11100f3c63fcf5753818e59d63088f' - 'SKIP' - '8714ba22911a58ab3eb42ac3f4c6c3bd' - '662e6450e19a5acdaa5c9fcb8ad78dea' - '7d01a99f389d8f08dec93ed479071ee4' - 'bc12ad4d0c6e6c0e72d9fb61054f446b' - 'e58d4211c5b29d7d927a304d082849e7' - '45ac9e987f4bf16c0d7e1685db943917') +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}) +md5sums=('571d470a7647b455e3af3f92d79f1c18' + 'SKIP') build() { cd ${srcdir}/${pkgname}-${pkgver} - - # http://savannah.gnu.org/bugs/?30612 - patch -Np1 -i $srcdir/make-3.82-bug30612.patch - - # http://savannah.gnu.org/bugs/?30723 - patch -Np1 -i $srcdir/make-3.82-bug30723.patch - - # https://bugs.archlinux.org/task/22733 (fix from Fedora) - patch -Np1 -i $srcdir/make-3.82-sort-blank.patch - - # https://savannah.gnu.org/bugs/?33873 - patch -Np0 -i $srcdir/make-3.82-makeflags.patch - - # http://lists.gnu.org/archive/html/bug-make/2011-04/msg00002.html - patch -Np0 -i $srcdir/make-3.82-expensive_glob.patch - - # https://savannah.gnu.org/bugs/?30653 - patch -Np0 -i $srcdir/make-3.82-dont-prune-intermediate.patch - ./configure --prefix=/usr make } diff --git a/core/man-db/PKGBUILD b/core/man-db/PKGBUILD index e2671a68f..85387f10a 100644 --- a/core/man-db/PKGBUILD +++ b/core/man-db/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189192 2013-06-29 06:03:40Z andyrtr $ +# $Id: PKGBUILD 197832 2013-10-30 11:05:56Z allan $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Sergej Pupykin <sergej@aur.archlinux.org> @@ -20,7 +20,6 @@ replaces=('man') install=${pkgname}.install source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.xz{,.sig} convert-mans man-db.cron.daily) -options=('!libtool') md5sums=('36f59d9314b45a266ba350584b4d7cc1' 'SKIP' '2b7662a7d5b33fe91f9f3e034361a2f6' diff --git a/core/mpfr/PKGBUILD b/core/mpfr/PKGBUILD index e64a984db..4a7e99916 100644 --- a/core/mpfr/PKGBUILD +++ b/core/mpfr/PKGBUILD @@ -1,27 +1,28 @@ -# $Id: PKGBUILD 180068 2013-03-15 22:55:34Z allan $ +# $Id: PKGBUILD 197157 2013-10-23 13:04:22Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=mpfr _pkgver=3.1.2 -#_patchlevel=p1 -#pkgver=${_pkgver}.${_patchlevel} -pkgver=${_pkgver} -pkgrel=1 +_patchlevel=p3 +pkgver=${_pkgver}.${_patchlevel} +#pkgver=${_pkgver} +pkgrel=2 pkgdesc="Multiple-precision floating-point library" arch=('i686' 'x86_64' 'mips64el') url="http://www.mpfr.org/" license=('LGPL') depends=('gmp>=5.0') -options=('!libtool') install=mpfr.install -source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz{,.asc}) +source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz{,.asc} + mpfr-${_pkgver}-${_patchlevel}.patch) md5sums=('e3d203d188b8fe60bb6578dd3152e05c' - '63d1a00bedd4fed3717115297f70d029') + 'SKIP' + 'd22c975afc8599b06dd0d6c1128ac078') build() { cd "${srcdir}/${pkgname}-${_pkgver}" - #patch -p1 -i $srcdir/mpfr-${_pkgver}-${_patchlevel}.patch + patch -p1 -i $srcdir/mpfr-${_pkgver}-${_patchlevel}.patch ./configure --prefix=/usr --enable-thread-safe --enable-shared make } diff --git a/core/mpfr/mpfr-3.1.2-p3.patch b/core/mpfr/mpfr-3.1.2-p3.patch new file mode 100644 index 000000000..0339944b6 --- /dev/null +++ b/core/mpfr/mpfr-3.1.2-p3.patch @@ -0,0 +1,779 @@ +diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES +--- mpfr-3.1.2-a/PATCHES 2013-09-26 10:52:52.000000000 +0000 ++++ mpfr-3.1.2-b/PATCHES 2013-09-26 10:52:52.000000000 +0000 +@@ -0,0 +1 @@ ++exp_2 +diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION +--- mpfr-3.1.2-a/VERSION 2013-03-13 15:37:28.000000000 +0000 ++++ mpfr-3.1.2-b/VERSION 2013-09-26 10:52:52.000000000 +0000 +@@ -1 +1 @@ +-3.1.2 ++3.1.2-p1 +diff -Naurd mpfr-3.1.2-a/src/exp_2.c mpfr-3.1.2-b/src/exp_2.c +--- mpfr-3.1.2-a/src/exp_2.c 2013-03-13 15:37:28.000000000 +0000 ++++ mpfr-3.1.2-b/src/exp_2.c 2013-09-26 10:52:52.000000000 +0000 +@@ -204,7 +204,7 @@ + for (k = 0; k < K; k++) + { + mpz_mul (ss, ss, ss); +- exps <<= 1; ++ exps *= 2; + exps += mpz_normalize (ss, ss, q); + } + mpfr_set_z (s, ss, MPFR_RNDN); +diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h +--- mpfr-3.1.2-a/src/mpfr.h 2013-03-13 15:37:37.000000000 +0000 ++++ mpfr-3.1.2-b/src/mpfr.h 2013-09-26 10:52:52.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 2 +-#define MPFR_VERSION_STRING "3.1.2" ++#define MPFR_VERSION_STRING "3.1.2-p1" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c +--- mpfr-3.1.2-a/src/version.c 2013-03-13 15:37:34.000000000 +0000 ++++ mpfr-3.1.2-b/src/version.c 2013-09-26 10:52:52.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.2"; ++ return "3.1.2-p1"; + } +diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES +--- mpfr-3.1.2-a/PATCHES 2013-09-26 10:56:55.000000000 +0000 ++++ mpfr-3.1.2-b/PATCHES 2013-09-26 10:56:55.000000000 +0000 +@@ -0,0 +1 @@ ++fits-smallneg +diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION +--- mpfr-3.1.2-a/VERSION 2013-09-26 10:52:52.000000000 +0000 ++++ mpfr-3.1.2-b/VERSION 2013-09-26 10:56:55.000000000 +0000 +@@ -1 +1 @@ +-3.1.2-p1 ++3.1.2-p2 +diff -Naurd mpfr-3.1.2-a/src/fits_u.h mpfr-3.1.2-b/src/fits_u.h +--- mpfr-3.1.2-a/src/fits_u.h 2013-03-13 15:37:35.000000000 +0000 ++++ mpfr-3.1.2-b/src/fits_u.h 2013-09-26 10:56:55.000000000 +0000 +@@ -32,17 +32,20 @@ + int res; + + if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (f))) +- /* Zero always fit */ +- return MPFR_IS_ZERO (f) ? 1 : 0; +- else if (MPFR_IS_NEG (f)) +- /* Negative numbers don't fit */ +- return 0; +- /* now it fits if +- (a) f <= MAXIMUM +- (b) round(f, prec(slong), rnd) <= MAXIMUM */ ++ return MPFR_IS_ZERO (f) ? 1 : 0; /* Zero always fits */ + + e = MPFR_GET_EXP (f); + ++ if (MPFR_IS_NEG (f)) ++ return e >= 1 ? 0 /* f <= -1 does not fit */ ++ : rnd != MPFR_RNDN ? MPFR_IS_LIKE_RNDU (rnd, -1) /* directed mode */ ++ : e < 0 ? 1 /* f > -1/2 fits in MPFR_RNDN */ ++ : mpfr_powerof2_raw(f); /* -1/2 fits, -1 < f < -1/2 don't */ ++ ++ /* Now it fits if ++ (a) f <= MAXIMUM ++ (b) round(f, prec(slong), rnd) <= MAXIMUM */ ++ + /* first compute prec(MAXIMUM); fits in an int */ + for (s = MAXIMUM, prec = 0; s != 0; s /= 2, prec ++); + +diff -Naurd mpfr-3.1.2-a/src/fits_uintmax.c mpfr-3.1.2-b/src/fits_uintmax.c +--- mpfr-3.1.2-a/src/fits_uintmax.c 2013-03-13 15:37:33.000000000 +0000 ++++ mpfr-3.1.2-b/src/fits_uintmax.c 2013-09-26 10:56:55.000000000 +0000 +@@ -27,51 +27,19 @@ + #include "mpfr-intmax.h" + #include "mpfr-impl.h" + +-#ifdef _MPFR_H_HAVE_INTMAX_T +- +-/* We can't use fits_u.h <= mpfr_cmp_ui */ +-int +-mpfr_fits_uintmax_p (mpfr_srcptr f, mpfr_rnd_t rnd) +-{ +- mpfr_exp_t e; +- int prec; +- uintmax_t s; +- mpfr_t x; +- int res; +- +- if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (f))) +- /* Zero always fit */ +- return MPFR_IS_ZERO (f) ? 1 : 0; +- else if (MPFR_IS_NEG (f)) +- /* Negative numbers don't fit */ +- return 0; +- /* now it fits if +- (a) f <= MAXIMUM +- (b) round(f, prec(slong), rnd) <= MAXIMUM */ +- +- e = MPFR_GET_EXP (f); +- +- /* first compute prec(MAXIMUM); fits in an int */ +- for (s = MPFR_UINTMAX_MAX, prec = 0; s != 0; s /= 2, prec ++); +- +- /* MAXIMUM needs prec bits, i.e. MAXIMUM = 2^prec - 1 */ +- +- /* if e <= prec - 1, then f < 2^(prec-1) < MAXIMUM */ +- if (e <= prec - 1) +- return 1; ++/* Note: though mpfr-impl.h is included in fits_u.h, we also include it ++ above so that it gets included even when _MPFR_H_HAVE_INTMAX_T is not ++ defined; this is necessary to avoid an empty translation unit, which ++ is forbidden by ISO C. Without this, a failing test can be reproduced ++ by creating an invalid stdint.h somewhere in the default include path ++ and by compiling MPFR with "gcc -ansi -pedantic-errors". */ + +- /* if e >= prec + 1, then f >= 2^prec > MAXIMUM */ +- if (e >= prec + 1) +- return 0; ++#ifdef _MPFR_H_HAVE_INTMAX_T + +- MPFR_ASSERTD (e == prec); ++#define FUNCTION mpfr_fits_uintmax_p ++#define MAXIMUM MPFR_UINTMAX_MAX ++#define TYPE uintmax_t + +- /* hard case: first round to prec bits, then check */ +- mpfr_init2 (x, prec); +- mpfr_set (x, f, rnd); +- res = MPFR_GET_EXP (x) == e; +- mpfr_clear (x); +- return res; +-} ++#include "fits_u.h" + + #endif +diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h +--- mpfr-3.1.2-a/src/mpfr.h 2013-09-26 10:52:52.000000000 +0000 ++++ mpfr-3.1.2-b/src/mpfr.h 2013-09-26 10:56:55.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 2 +-#define MPFR_VERSION_STRING "3.1.2-p1" ++#define MPFR_VERSION_STRING "3.1.2-p2" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c +--- mpfr-3.1.2-a/src/version.c 2013-09-26 10:52:52.000000000 +0000 ++++ mpfr-3.1.2-b/src/version.c 2013-09-26 10:56:55.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.2-p1"; ++ return "3.1.2-p2"; + } +diff -Naurd mpfr-3.1.2-a/tests/tfits.c mpfr-3.1.2-b/tests/tfits.c +--- mpfr-3.1.2-a/tests/tfits.c 2013-03-13 15:37:45.000000000 +0000 ++++ mpfr-3.1.2-b/tests/tfits.c 2013-09-26 10:56:55.000000000 +0000 +@@ -33,155 +33,176 @@ + #include "mpfr-intmax.h" + #include "mpfr-test.h" + +-#define ERROR1 { printf("Initial error for x="); mpfr_dump(x); exit(1); } +-#define ERROR2 { printf("Error for x="); mpfr_dump(x); exit(1); } ++#define ERROR1(N) \ ++ do \ ++ { \ ++ printf("Error %d for rnd = %s and x = ", N, \ ++ mpfr_print_rnd_mode ((mpfr_rnd_t) r)); \ ++ mpfr_dump(x); \ ++ exit(1); \ ++ } \ ++ while (0) + + static void check_intmax (void); + + int + main (void) + { +- mpfr_t x; ++ mpfr_t x, y; ++ int i, r; + + tests_start_mpfr (); + + mpfr_init2 (x, 256); ++ mpfr_init2 (y, 8); + +- /* Check NAN */ +- mpfr_set_nan (x); +- if (mpfr_fits_ulong_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_slong_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_uint_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_sint_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_ushort_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_sshort_p (x, MPFR_RNDN)) +- ERROR1; ++ RND_LOOP (r) ++ { + +- /* Check INF */ +- mpfr_set_inf (x, 1); +- if (mpfr_fits_ulong_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_slong_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_uint_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_sint_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_ushort_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_sshort_p (x, MPFR_RNDN)) +- ERROR1; ++ /* Check NAN */ ++ mpfr_set_nan (x); ++ if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (1); ++ if (mpfr_fits_slong_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (2); ++ if (mpfr_fits_uint_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (3); ++ if (mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (4); ++ if (mpfr_fits_ushort_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (5); ++ if (mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (6); + +- /* Check Zero */ +- MPFR_SET_ZERO (x); +- if (!mpfr_fits_ulong_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_slong_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_uint_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_sint_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_ushort_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_sshort_p (x, MPFR_RNDN)) +- ERROR2; ++ /* Check INF */ ++ mpfr_set_inf (x, 1); ++ if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (7); ++ if (mpfr_fits_slong_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (8); ++ if (mpfr_fits_uint_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (9); ++ if (mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (10); ++ if (mpfr_fits_ushort_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (11); ++ if (mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (12); + +- /* Check small op */ +- mpfr_set_str1 (x, "1@-1"); +- if (!mpfr_fits_ulong_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_slong_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_uint_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_sint_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_ushort_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_sshort_p (x, MPFR_RNDN)) +- ERROR2; ++ /* Check Zero */ ++ MPFR_SET_ZERO (x); ++ if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (13); ++ if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (14); ++ if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (15); ++ if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (16); ++ if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (17); ++ if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (18); + +- /* Check 17 */ +- mpfr_set_ui (x, 17, MPFR_RNDN); +- if (!mpfr_fits_ulong_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_slong_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_uint_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_sint_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_ushort_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_sshort_p (x, MPFR_RNDN)) +- ERROR2; ++ /* Check small positive op */ ++ mpfr_set_str1 (x, "1@-1"); ++ if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (19); ++ if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (20); ++ if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (21); ++ if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (22); ++ if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (23); ++ if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (24); + +- /* Check all other values */ +- mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN); +- mpfr_mul_2exp (x, x, 1, MPFR_RNDN); +- if (mpfr_fits_ulong_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_slong_p (x, MPFR_RNDN)) +- ERROR1; +- mpfr_mul_2exp (x, x, 40, MPFR_RNDN); +- if (mpfr_fits_ulong_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_uint_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_sint_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_ushort_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_sshort_p (x, MPFR_RNDN)) +- ERROR1; ++ /* Check 17 */ ++ mpfr_set_ui (x, 17, MPFR_RNDN); ++ if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (25); ++ if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (26); ++ if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (27); ++ if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (28); ++ if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (29); ++ if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (30); + +- mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN); +- if (!mpfr_fits_ulong_p (x, MPFR_RNDN)) +- ERROR2; +- mpfr_set_ui (x, LONG_MAX, MPFR_RNDN); +- if (!mpfr_fits_slong_p (x, MPFR_RNDN)) +- ERROR2; +- mpfr_set_ui (x, UINT_MAX, MPFR_RNDN); +- if (!mpfr_fits_uint_p (x, MPFR_RNDN)) +- ERROR2; +- mpfr_set_ui (x, INT_MAX, MPFR_RNDN); +- if (!mpfr_fits_sint_p (x, MPFR_RNDN)) +- ERROR2; +- mpfr_set_ui (x, USHRT_MAX, MPFR_RNDN); +- if (!mpfr_fits_ushort_p (x, MPFR_RNDN)) +- ERROR2; +- mpfr_set_ui (x, SHRT_MAX, MPFR_RNDN); +- if (!mpfr_fits_sshort_p (x, MPFR_RNDN)) +- ERROR2; ++ /* Check all other values */ ++ mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN); ++ mpfr_mul_2exp (x, x, 1, MPFR_RNDN); ++ if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (31); ++ if (mpfr_fits_slong_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (32); ++ mpfr_mul_2exp (x, x, 40, MPFR_RNDN); ++ if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (33); ++ if (mpfr_fits_uint_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (34); ++ if (mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (35); ++ if (mpfr_fits_ushort_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (36); ++ if (mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (37); + +- mpfr_set_si (x, 1, MPFR_RNDN); +- if (!mpfr_fits_sint_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_sshort_p (x, MPFR_RNDN)) +- ERROR2; ++ mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN); ++ if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (38); ++ mpfr_set_ui (x, LONG_MAX, MPFR_RNDN); ++ if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (39); ++ mpfr_set_ui (x, UINT_MAX, MPFR_RNDN); ++ if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (40); ++ mpfr_set_ui (x, INT_MAX, MPFR_RNDN); ++ if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (41); ++ mpfr_set_ui (x, USHRT_MAX, MPFR_RNDN); ++ if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (42); ++ mpfr_set_ui (x, SHRT_MAX, MPFR_RNDN); ++ if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (43); + +- /* Check negative value */ +- mpfr_set_si (x, -1, MPFR_RNDN); +- if (!mpfr_fits_sint_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_sshort_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_slong_p (x, MPFR_RNDN)) +- ERROR2; +- if (mpfr_fits_uint_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_ushort_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_ulong_p (x, MPFR_RNDN)) +- ERROR1; ++ mpfr_set_si (x, 1, MPFR_RNDN); ++ if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (44); ++ if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (45); ++ ++ /* Check negative op */ ++ for (i = 1; i <= 4; i++) ++ { ++ int inv; ++ ++ mpfr_set_si_2exp (x, -i, -2, MPFR_RNDN); ++ mpfr_rint (y, x, (mpfr_rnd_t) r); ++ inv = MPFR_NOTZERO (y); ++ if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r) ^ inv) ++ ERROR1 (46); ++ if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (47); ++ if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r) ^ inv) ++ ERROR1 (48); ++ if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (49); ++ if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r) ^ inv) ++ ERROR1 (50); ++ if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (51); ++ } ++ } + + mpfr_clear (x); ++ mpfr_clear (y); + + check_intmax (); + +@@ -189,85 +210,98 @@ + return 0; + } + +-static void check_intmax (void) ++static void ++check_intmax (void) + { + #ifdef _MPFR_H_HAVE_INTMAX_T +- mpfr_t x; ++ mpfr_t x, y; ++ int i, r; + +- mpfr_init2 (x, sizeof (uintmax_t)*CHAR_BIT); ++ mpfr_init2 (x, sizeof (uintmax_t) * CHAR_BIT); ++ mpfr_init2 (y, 8); + +- /* Check NAN */ +- mpfr_set_nan (x); +- if (mpfr_fits_uintmax_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_intmax_p (x, MPFR_RNDN)) +- ERROR1; ++ RND_LOOP (r) ++ { ++ /* Check NAN */ ++ mpfr_set_nan (x); ++ if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (52); ++ if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (53); + +- /* Check INF */ +- mpfr_set_inf (x, 1); +- if (mpfr_fits_uintmax_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_intmax_p (x, MPFR_RNDN)) +- ERROR1; ++ /* Check INF */ ++ mpfr_set_inf (x, 1); ++ if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (54); ++ if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (55); + +- /* Check Zero */ +- MPFR_SET_ZERO (x); +- if (!mpfr_fits_uintmax_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_intmax_p (x, MPFR_RNDN)) +- ERROR2; ++ /* Check Zero */ ++ MPFR_SET_ZERO (x); ++ if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (56); ++ if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (57); + +- /* Check small op */ +- mpfr_set_str1 (x, "1@-1"); +- if (!mpfr_fits_uintmax_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_intmax_p (x, MPFR_RNDN)) +- ERROR2; ++ /* Check positive small op */ ++ mpfr_set_str1 (x, "1@-1"); ++ if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (58); ++ if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (59); + +- /* Check 17 */ +- mpfr_set_ui (x, 17, MPFR_RNDN); +- if (!mpfr_fits_uintmax_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_intmax_p (x, MPFR_RNDN)) +- ERROR2; ++ /* Check 17 */ ++ mpfr_set_ui (x, 17, MPFR_RNDN); ++ if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (60); ++ if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (61); + +- /* Check hugest */ +- mpfr_set_ui_2exp (x, 42, sizeof (uintmax_t) * 32, MPFR_RNDN); +- if (mpfr_fits_uintmax_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_intmax_p (x, MPFR_RNDN)) +- ERROR1; ++ /* Check hugest */ ++ mpfr_set_ui_2exp (x, 42, sizeof (uintmax_t) * 32, MPFR_RNDN); ++ if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (62); ++ if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (63); + +- /* Check all other values */ +- mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN); +- mpfr_add_ui (x, x, 1, MPFR_RNDN); +- if (mpfr_fits_uintmax_p (x, MPFR_RNDN)) +- ERROR1; +- mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN); +- if (!mpfr_fits_uintmax_p (x, MPFR_RNDN)) +- ERROR2; +- mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN); +- mpfr_add_ui (x, x, 1, MPFR_RNDN); +- if (mpfr_fits_intmax_p (x, MPFR_RNDN)) +- ERROR1; +- mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN); +- if (!mpfr_fits_intmax_p (x, MPFR_RNDN)) +- ERROR2; +- mpfr_set_sj (x, MPFR_INTMAX_MIN, MPFR_RNDN); +- if (!mpfr_fits_intmax_p (x, MPFR_RNDN)) +- ERROR2; +- mpfr_sub_ui (x, x, 1, MPFR_RNDN); +- if (mpfr_fits_intmax_p (x, MPFR_RNDN)) +- ERROR1; ++ /* Check all other values */ ++ mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN); ++ mpfr_add_ui (x, x, 1, MPFR_RNDN); ++ if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (64); ++ mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN); ++ if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (65); ++ mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN); ++ mpfr_add_ui (x, x, 1, MPFR_RNDN); ++ if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (66); ++ mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN); ++ if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (67); ++ mpfr_set_sj (x, MPFR_INTMAX_MIN, MPFR_RNDN); ++ if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (68); ++ mpfr_sub_ui (x, x, 1, MPFR_RNDN); ++ if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (69); + +- /* Check negative value */ +- mpfr_set_si (x, -1, MPFR_RNDN); +- if (!mpfr_fits_intmax_p (x, MPFR_RNDN)) +- ERROR2; +- if (mpfr_fits_uintmax_p (x, MPFR_RNDN)) +- ERROR1; ++ /* Check negative op */ ++ for (i = 1; i <= 4; i++) ++ { ++ int inv; ++ ++ mpfr_set_si_2exp (x, -i, -2, MPFR_RNDN); ++ mpfr_rint (y, x, (mpfr_rnd_t) r); ++ inv = MPFR_NOTZERO (y); ++ if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r) ^ inv) ++ ERROR1 (70); ++ if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (71); ++ } ++ } + + mpfr_clear (x); ++ mpfr_clear (y); + #endif + } +- +diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES +--- mpfr-3.1.2-a/PATCHES 2013-10-09 13:34:21.000000000 +0000 ++++ mpfr-3.1.2-b/PATCHES 2013-10-09 13:34:21.000000000 +0000 +@@ -0,0 +1 @@ ++clang-divby0 +diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION +--- mpfr-3.1.2-a/VERSION 2013-09-26 10:52:52.000000000 +0000 ++++ mpfr-3.1.2-b/VERSION 2013-10-09 13:34:21.000000000 +0000 +@@ -1 +1 @@ +-3.1.2-p2 ++3.1.2-p3 +diff -Naurd mpfr-3.1.2-a/src/mpfr-impl.h mpfr-3.1.2-b/src/mpfr-impl.h +--- mpfr-3.1.2-a/src/mpfr-impl.h 2013-03-13 15:37:36.000000000 +0000 ++++ mpfr-3.1.2-b/src/mpfr-impl.h 2013-10-09 13:34:21.000000000 +0000 +@@ -468,8 +468,16 @@ + #define MPFR_LIMBS_PER_FLT ((IEEE_FLT_MANT_DIG-1)/GMP_NUMB_BITS+1) + + /* Visual C++ doesn't support +1.0/0.0, -1.0/0.0 and 0.0/0.0 +- at compile time. */ +-#if defined(_MSC_VER) && defined(_WIN32) && (_MSC_VER >= 1200) ++ at compile time. ++ Clang with -fsanitize=undefined is a bit similar due to a bug: ++ http://llvm.org/bugs/show_bug.cgi?id=17381 ++ but even without its sanitizer, it may be better to use the ++ double_zero version until IEEE 754 division by zero is properly ++ supported: ++ http://llvm.org/bugs/show_bug.cgi?id=17000 ++*/ ++#if (defined(_MSC_VER) && defined(_WIN32) && (_MSC_VER >= 1200)) || \ ++ defined(__clang__) + static double double_zero = 0.0; + # define DBL_NAN (double_zero/double_zero) + # define DBL_POS_INF ((double) 1.0/double_zero) +@@ -501,6 +509,8 @@ + (with Xcode 2.4.1, i.e. the latest one). */ + #define LVALUE(x) (&(x) == &(x) || &(x) != &(x)) + #define DOUBLE_ISINF(x) (LVALUE(x) && ((x) > DBL_MAX || (x) < -DBL_MAX)) ++/* The DOUBLE_ISNAN(x) macro is also valid on long double x ++ (assuming that the compiler isn't too broken). */ + #ifdef MPFR_NANISNAN + /* Avoid MIPSpro / IRIX64 / gcc -ffast-math (incorrect) optimizations. + The + must not be replaced by a ||. With gcc -ffast-math, NaN is +diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h +--- mpfr-3.1.2-a/src/mpfr.h 2013-09-26 10:52:52.000000000 +0000 ++++ mpfr-3.1.2-b/src/mpfr.h 2013-10-09 13:34:21.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 2 +-#define MPFR_VERSION_STRING "3.1.2-p2" ++#define MPFR_VERSION_STRING "3.1.2-p3" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c +--- mpfr-3.1.2-a/src/version.c 2013-09-26 10:52:52.000000000 +0000 ++++ mpfr-3.1.2-b/src/version.c 2013-10-09 13:34:21.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.2-p2"; ++ return "3.1.2-p3"; + } +diff -Naurd mpfr-3.1.2-a/tests/tget_flt.c mpfr-3.1.2-b/tests/tget_flt.c +--- mpfr-3.1.2-a/tests/tget_flt.c 2013-03-13 15:37:44.000000000 +0000 ++++ mpfr-3.1.2-b/tests/tget_flt.c 2013-10-09 13:34:21.000000000 +0000 +@@ -28,9 +28,17 @@ + main (void) + { + mpfr_t x, y; +- float f, g, infp; ++ float f, g; + int i; ++#if !defined(MPFR_ERRDIVZERO) ++ float infp; ++#endif ++ ++ tests_start_mpfr (); + ++#if !defined(MPFR_ERRDIVZERO) ++ /* The definition of DBL_POS_INF involves a division by 0. This makes ++ "clang -O2 -fsanitize=undefined -fno-sanitize-recover" fail. */ + infp = (float) DBL_POS_INF; + if (infp * 0.5 != infp) + { +@@ -38,8 +46,7 @@ + fprintf (stderr, "(this is probably a compiler bug, please report)\n"); + exit (1); + } +- +- tests_start_mpfr (); ++#endif + + mpfr_init2 (x, 24); + mpfr_init2 (y, 24); +@@ -353,6 +360,7 @@ + printf ("expected %.8e, got %.8e\n", g, f); + exit (1); + } ++#if !defined(MPFR_ERRDIVZERO) + f = mpfr_get_flt (x, MPFR_RNDN); /* first round to 2^128 (even rule), + thus we should get +Inf */ + g = infp; +@@ -376,6 +384,7 @@ + printf ("expected %.8e, got %.8e\n", g, f); + exit (1); + } ++#endif + + mpfr_clear (x); + mpfr_clear (y); +diff -Naurd mpfr-3.1.2-a/tests/tset_ld.c mpfr-3.1.2-b/tests/tset_ld.c +--- mpfr-3.1.2-a/tests/tset_ld.c 2013-03-13 15:37:44.000000000 +0000 ++++ mpfr-3.1.2-b/tests/tset_ld.c 2013-10-09 13:34:21.000000000 +0000 +@@ -47,8 +47,11 @@ + static int + Isnan_ld (long double d) + { +- double e = (double) d; +- if (DOUBLE_ISNAN (e)) ++ /* Do not convert d to double as this can give an overflow, which ++ may confuse compilers without IEEE 754 support (such as clang ++ -fsanitize=undefined), or trigger a trap if enabled. ++ The DOUBLE_ISNAN macro should work fine on long double. */ ++ if (DOUBLE_ISNAN (d)) + return 1; + LONGDOUBLE_NAN_ACTION (d, goto yes); + return 0; diff --git a/core/ncurses/PKGBUILD b/core/ncurses/PKGBUILD index dd9889019..163d72062 100644 --- a/core/ncurses/PKGBUILD +++ b/core/ncurses/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180326 2013-03-20 13:37:40Z allan $ +# $Id: PKGBUILD 197156 2013-10-23 13:04:21Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=ncurses pkgver=5.9 -pkgrel=5 +pkgrel=6 pkgdesc="System V Release 4.0 curses emulation library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/ncurses/" @@ -40,9 +40,7 @@ package() { # fool packages looking to link to non-wide-character ncurses libraries for lib in ncurses form panel menu; do echo "INPUT(-l${lib}w)" >${pkgdir}/usr/lib/lib${lib}.so - ln -s lib${lib}w.a ${pkgdir}/usr/lib/lib${lib}.a done - ln -s libncurses++w.a ${pkgdir}/usr/lib/libncurses++.a for lib in ncurses ncurses++ form panel menu; do ln -s ${lib}w.pc ${pkgdir}/usr/lib/pkgconfig/${lib}.pc @@ -51,8 +49,6 @@ package() { # some packages look for -lcurses during build echo "INPUT(-lncursesw)" >${pkgdir}/usr/lib/libcursesw.so ln -s libncurses.so ${pkgdir}/usr/lib/libcurses.so - ln -s libncursesw.a ${pkgdir}/usr/lib/libcursesw.a - ln -s libncurses.a ${pkgdir}/usr/lib/libcurses.a # non-widec compatibility libraries cd ${srcdir}/ncurses-build diff --git a/core/nfsidmap/PKGBUILD b/core/nfsidmap/PKGBUILD index 5f00e41da..90c961ae0 100644 --- a/core/nfsidmap/PKGBUILD +++ b/core/nfsidmap/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 167157 2012-09-26 16:38:02Z tpowa $ +# $Id: PKGBUILD 197833 2013-10-30 11:06:02Z allan $ # Maintainer: # Contributor: Judd <jvinet@zeroflux.org> pkgname=nfsidmap pkgver=0.25 -pkgrel=1 +pkgrel=2 pkgdesc="Library to help mapping IDs, mainly for NFSv4" arch=('i686' 'x86_64' 'mips64el') url="http://www.citi.umich.edu/projects/nfsv4/linux/" depends=('glibc' 'libldap>=2.4.18') license=('custom:nfsidmap') -options=(!libtool) source=(http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/libnfsidmap-$pkgver.tar.gz) build() { diff --git a/core/nilfs-utils/PKGBUILD b/core/nilfs-utils/PKGBUILD index 6e2204bb5..7829ccb7a 100644 --- a/core/nilfs-utils/PKGBUILD +++ b/core/nilfs-utils/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 187036 2013-06-03 11:15:27Z allan $ +# $Id: PKGBUILD 197802 2013-10-30 10:38:00Z allan $ # Maintainer: Dan McGee <dan@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=nilfs-utils pkgver=2.1.5 -pkgrel=2 +pkgrel=3 pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)" arch=('i686' 'x86_64' 'mips64el') url="http://www.nilfs.org/" license=('GPL2' 'LGPL2.1') backup=('etc/nilfs_cleanerd.conf') depends=('util-linux') -options=(!libtool) source=(http://www.nilfs.org/download/$pkgname-$pkgver.tar.bz2) md5sums=('f072cc53c288492061b3199d63e32177') diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD index e1e900456..2a8f2126d 100644 --- a/core/openldap/PKGBUILD +++ b/core/openldap/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193901 2013-09-04 19:28:51Z eric $ +# $Id: PKGBUILD 198764 2013-11-03 16:44:35Z eric $ # Maintainer: pkgbase=openldap pkgname=('libldap' 'openldap') -pkgver=2.4.36 +pkgver=2.4.37 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.openldap.org/" @@ -11,7 +11,7 @@ license=('custom') makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux' 'chrpath') source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz slapd.service slapd.tmpfiles openldap-ntlm.patch) -sha1sums=('da0e18a28a5dade5c98d9a382fd8f0a676a12aca' +sha1sums=('179b3d51f7569cca768384fee92aa43c8a82c5d9' '2441815efbfa01ad7a1d39068e5503b53d1d04b0' '59241a813d7508294e4ef1cec3bfe1f5495e109d' 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef') @@ -52,7 +52,6 @@ package_libldap() { pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries" depends=('libsasl' 'e2fsprogs') backup=('etc/openldap/ldap.conf') - options=('!libtool') cd ${pkgbase}-${pkgver} for dir in include libraries doc/man/man3 ; do @@ -75,7 +74,7 @@ package_openldap() { pkgdesc="Lightweight Directory Access Protocol (LDAP) client and server" depends=("libldap>=${pkgver}" 'libltdl') backup=('etc/openldap/slapd.conf' 'etc/openldap/slapd.ldif') - options=('!libtool' 'emptydirs') + options=('emptydirs') install=openldap.install cd ${pkgbase}-${pkgver} diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD index ce3bf2728..033396bc8 100644 --- a/core/openssl/PKGBUILD +++ b/core/openssl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178169 2013-02-17 17:21:40Z pierre $ +# $Id: PKGBUILD 197168 2013-10-23 13:51:53Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=openssl @@ -6,7 +6,7 @@ _ver=1.0.1e # use a pacman compatible version scheme pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} #pkgver=$_ver -pkgrel=3 +pkgrel=4 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security' arch=('i686' 'x86_64' 'mips64el') url='https://www.openssl.org' @@ -18,13 +18,15 @@ backup=('etc/ssl/openssl.cnf') source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz" "https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc" 'no-rpath.patch' - 'ca-dir.patch') + 'ca-dir.patch' + 'openssl-1.0.1e-fix_pod_syntax-1.patch') md5sums=('66bf6f10f060d561929de96f9dfe5b8c' - 'e18847df48d39416f4ca5064887a2e28' + 'SKIP' 'dc78d3d06baffc16217519242ce92478' - '3bf51be3a1bbd262be46dc619f92aa90') + '3bf51be3a1bbd262be46dc619f92aa90' + '88d3bef4bbdc640b0412315d8d347bdf') -build() { +prepare() { cd $srcdir/$pkgname-$_ver # remove rpath: http://bugs.archlinux.org/task/14367 @@ -32,6 +34,12 @@ build() { # set ca dir to /etc/ssl by default patch -p0 -i $srcdir/ca-dir.patch + patch -p1 -i $srcdir/openssl-1.0.1e-fix_pod_syntax-1.patch +} + +build() { + cd $srcdir/$pkgname-$_ver + case "${CARCH}" in 'x86_64') openssltarget='linux-x86_64' @@ -44,7 +52,7 @@ build() { # mark stack as non-executable: http://bugs.archlinux.org/task/12434 ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \ - shared zlib enable-md2 ${optflags} \ + shared zlib ${optflags} \ "${openssltarget}" \ -Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}" diff --git a/core/openssl/openssl-1.0.1e-fix_pod_syntax-1.patch b/core/openssl/openssl-1.0.1e-fix_pod_syntax-1.patch new file mode 100644 index 000000000..ba25afec3 --- /dev/null +++ b/core/openssl/openssl-1.0.1e-fix_pod_syntax-1.patch @@ -0,0 +1,393 @@ +Submitted By: Martin Ward <macros_the_black at ntlworld dot com> +Date: 2013-06-18 +Initial Package Version: 1.0.1e +Upstream Status: Unknown +Origin: self, based on fedora +Description: Fixes install with perl-5.18. + +diff -Naur openssl-1.0.1e.orig/doc/apps/cms.pod openssl-1.0.1e/doc/apps/cms.pod +--- openssl-1.0.1e.orig/doc/apps/cms.pod 2013-06-06 14:35:15.867871879 +0100 ++++ openssl-1.0.1e/doc/apps/cms.pod 2013-06-06 14:35:25.791747119 +0100 +@@ -450,28 +450,28 @@ + + =over 4 + +-=item 0 ++=item C<0> + + the operation was completely successfully. + +-=item 1 ++=item C<1> + + an error occurred parsing the command options. + +-=item 2 ++=item C<2> + + one of the input files could not be read. + +-=item 3 ++=item C<3> + + an error occurred creating the CMS file or when reading the MIME + message. + +-=item 4 ++=item C<4> + + an error occurred decrypting or verifying the message. + +-=item 5 ++=item C<5> + + the message was verified correctly but an error occurred writing out + the signers certificates. +diff -Naur openssl-1.0.1e.orig/doc/apps/smime.pod openssl-1.0.1e/doc/apps/smime.pod +--- openssl-1.0.1e.orig/doc/apps/smime.pod 2013-06-06 14:35:15.867871879 +0100 ++++ openssl-1.0.1e/doc/apps/smime.pod 2013-06-06 14:35:25.794747082 +0100 +@@ -308,28 +308,28 @@ + + =over 4 + +-=item 0 ++=item C<0> + + the operation was completely successfully. + +-=item 1 ++=item C<1> + + an error occurred parsing the command options. + +-=item 2 ++=item C<2> + + one of the input files could not be read. + +-=item 3 ++=item C<3> + + an error occurred creating the PKCS#7 file or when reading the MIME + message. + +-=item 4 ++=item C<4> + + an error occurred decrypting or verifying the message. + +-=item 5 ++=item C<5> + + the message was verified correctly but an error occurred writing out + the signers certificates. +diff -Naur openssl-1.0.1e.orig/doc/crypto/X509_STORE_CTX_get_error.pod openssl-1.0.1e/doc/crypto/X509_STORE_CTX_get_error.pod +--- openssl-1.0.1e.orig/doc/crypto/X509_STORE_CTX_get_error.pod 2013-06-06 14:35:15.874871791 +0100 ++++ openssl-1.0.1e/doc/crypto/X509_STORE_CTX_get_error.pod 2013-06-06 14:37:13.826388940 +0100 +@@ -278,6 +278,8 @@ + an application specific error. This will never be returned unless explicitly + set by an application. + ++=back ++ + =head1 NOTES + + The above functions should be used instead of directly referencing the fields +diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_accept.pod openssl-1.0.1e/doc/ssl/SSL_accept.pod +--- openssl-1.0.1e.orig/doc/ssl/SSL_accept.pod 2013-06-06 14:35:15.871871829 +0100 ++++ openssl-1.0.1e/doc/ssl/SSL_accept.pod 2013-06-06 14:35:25.796747057 +0100 +@@ -44,12 +44,12 @@ + + =over 4 + +-=item 1 ++=item C<1> + + The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been + established. + +-=item 0 ++=item C<0> + + The TLS/SSL handshake was not successful but was shut down controlled and + by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the +diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_clear.pod openssl-1.0.1e/doc/ssl/SSL_clear.pod +--- openssl-1.0.1e.orig/doc/ssl/SSL_clear.pod 2013-06-06 14:35:15.871871829 +0100 ++++ openssl-1.0.1e/doc/ssl/SSL_clear.pod 2013-06-06 14:35:25.803746969 +0100 +@@ -56,12 +56,12 @@ + + =over 4 + +-=item 0 ++=item C<0> + + The SSL_clear() operation could not be performed. Check the error stack to + find out the reason. + +-=item 1 ++=item C<1> + + The SSL_clear() operation was successful. + +diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_COMP_add_compression_method.pod openssl-1.0.1e/doc/ssl/SSL_COMP_add_compression_method.pod +--- openssl-1.0.1e.orig/doc/ssl/SSL_COMP_add_compression_method.pod 2013-06-06 14:35:15.870871842 +0100 ++++ openssl-1.0.1e/doc/ssl/SSL_COMP_add_compression_method.pod 2013-06-06 14:35:25.806746931 +0100 +@@ -53,11 +53,11 @@ + + =over 4 + +-=item 0 ++=item C<0> + + The operation succeeded. + +-=item 1 ++=item C<1> + + The operation failed. Check the error queue to find out the reason. + +diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_connect.pod openssl-1.0.1e/doc/ssl/SSL_connect.pod +--- openssl-1.0.1e.orig/doc/ssl/SSL_connect.pod 2013-06-06 14:35:15.869871854 +0100 ++++ openssl-1.0.1e/doc/ssl/SSL_connect.pod 2013-06-06 14:35:25.808746906 +0100 +@@ -41,12 +41,12 @@ + + =over 4 + +-=item 1 ++=item C<1> + + The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been + established. + +-=item 0 ++=item C<0> + + The TLS/SSL handshake was not successful but was shut down controlled and + by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the +diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_CTX_add_session.pod openssl-1.0.1e/doc/ssl/SSL_CTX_add_session.pod +--- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_add_session.pod 2013-06-06 14:35:15.871871829 +0100 ++++ openssl-1.0.1e/doc/ssl/SSL_CTX_add_session.pod 2013-06-06 14:35:25.816746805 +0100 +@@ -52,13 +52,13 @@ + + =over 4 + +-=item 0 ++=item C<0> + + The operation failed. In case of the add operation, it was tried to add + the same (identical) session twice. In case of the remove operation, the + session was not found in the cache. + +-=item 1 ++=item C<1> + + The operation succeeded. + +diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_CTX_load_verify_locations.pod openssl-1.0.1e/doc/ssl/SSL_CTX_load_verify_locations.pod +--- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_load_verify_locations.pod 2013-06-06 14:35:15.870871842 +0100 ++++ openssl-1.0.1e/doc/ssl/SSL_CTX_load_verify_locations.pod 2013-06-06 14:35:25.818746780 +0100 +@@ -100,13 +100,13 @@ + + =over 4 + +-=item 0 ++=item C<0> + + The operation failed because B<CAfile> and B<CApath> are NULL or the + processing at one of the locations specified failed. Check the error + stack to find out the reason. + +-=item 1 ++=item C<1> + + The operation succeeded. + +diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_CTX_set_client_CA_list.pod openssl-1.0.1e/doc/ssl/SSL_CTX_set_client_CA_list.pod +--- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_set_client_CA_list.pod 2013-06-06 14:35:15.871871829 +0100 ++++ openssl-1.0.1e/doc/ssl/SSL_CTX_set_client_CA_list.pod 2013-06-06 14:35:25.821746742 +0100 +@@ -66,11 +66,11 @@ + + =over 4 + +-=item 1 ++=item C<1> + + The operation succeeded. + +-=item 0 ++=item C<0> + + A failure while manipulating the STACK_OF(X509_NAME) object occurred or + the X509_NAME could not be extracted from B<cacert>. Check the error stack +diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_CTX_set_session_id_context.pod openssl-1.0.1e/doc/ssl/SSL_CTX_set_session_id_context.pod +--- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_set_session_id_context.pod 2013-06-06 14:35:15.871871829 +0100 ++++ openssl-1.0.1e/doc/ssl/SSL_CTX_set_session_id_context.pod 2013-06-06 14:35:25.828746654 +0100 +@@ -64,13 +64,13 @@ + + =over 4 + +-=item 0 ++=item C<0> + + The length B<sid_ctx_len> of the session id context B<sid_ctx> exceeded + the maximum allowed length of B<SSL_MAX_SSL_SESSION_ID_LENGTH>. The error + is logged to the error stack. + +-=item 1 ++=item C<1> + + The operation succeeded. + +diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_CTX_set_ssl_version.pod openssl-1.0.1e/doc/ssl/SSL_CTX_set_ssl_version.pod +--- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_set_ssl_version.pod 2013-06-06 14:35:15.871871829 +0100 ++++ openssl-1.0.1e/doc/ssl/SSL_CTX_set_ssl_version.pod 2013-06-06 14:35:25.831746617 +0100 +@@ -42,11 +42,11 @@ + + =over 4 + +-=item 0 ++=item C<0> + + The new choice failed, check the error stack to find out the reason. + +-=item 1 ++=item C<1> + + The operation succeeded. + +diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_CTX_use_psk_identity_hint.pod openssl-1.0.1e/doc/ssl/SSL_CTX_use_psk_identity_hint.pod +--- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_use_psk_identity_hint.pod 2013-06-06 14:35:15.870871842 +0100 ++++ openssl-1.0.1e/doc/ssl/SSL_CTX_use_psk_identity_hint.pod 2013-06-06 14:36:42.456783309 +0100 +@@ -81,6 +81,8 @@ + + Return values from the server callback are interpreted as follows: + ++=over ++ + =item > 0 + + PSK identity was found and the server callback has provided the PSK +@@ -94,9 +96,11 @@ + connection will fail with decryption_error before it will be finished + completely. + +-=item 0 ++=item C<0> + + PSK identity was not found. An "unknown_psk_identity" alert message + will be sent and the connection setup fails. + ++=back ++ + =cut +diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_do_handshake.pod openssl-1.0.1e/doc/ssl/SSL_do_handshake.pod +--- openssl-1.0.1e.orig/doc/ssl/SSL_do_handshake.pod 2013-06-06 14:35:15.869871854 +0100 ++++ openssl-1.0.1e/doc/ssl/SSL_do_handshake.pod 2013-06-06 14:35:25.839746516 +0100 +@@ -45,12 +45,12 @@ + + =over 4 + +-=item 1 ++=item C<1> + + The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been + established. + +-=item 0 ++=item C<0> + + The TLS/SSL handshake was not successful but was shut down controlled and + by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the +diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_read.pod openssl-1.0.1e/doc/ssl/SSL_read.pod +--- openssl-1.0.1e.orig/doc/ssl/SSL_read.pod 2013-06-06 14:35:15.871871829 +0100 ++++ openssl-1.0.1e/doc/ssl/SSL_read.pod 2013-06-06 14:35:25.847746415 +0100 +@@ -86,7 +86,7 @@ + The read operation was successful; the return value is the number of + bytes actually read from the TLS/SSL connection. + +-=item 0 ++=item C<0> + + The read operation was not successful. The reason may either be a clean + shutdown due to a "close notify" alert sent by the peer (in which case +diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_session_reused.pod openssl-1.0.1e/doc/ssl/SSL_session_reused.pod +--- openssl-1.0.1e.orig/doc/ssl/SSL_session_reused.pod 2013-06-06 14:35:15.871871829 +0100 ++++ openssl-1.0.1e/doc/ssl/SSL_session_reused.pod 2013-06-06 14:35:25.849746390 +0100 +@@ -27,11 +27,11 @@ + + =over 4 + +-=item 0 ++=item C<0> + + A new session was negotiated. + +-=item 1 ++=item C<1> + + A session was reused. + +diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_set_fd.pod openssl-1.0.1e/doc/ssl/SSL_set_fd.pod +--- openssl-1.0.1e.orig/doc/ssl/SSL_set_fd.pod 2013-06-06 14:35:15.869871854 +0100 ++++ openssl-1.0.1e/doc/ssl/SSL_set_fd.pod 2013-06-06 14:35:25.852746353 +0100 +@@ -35,11 +35,11 @@ + + =over 4 + +-=item 0 ++=item C<0> + + The operation failed. Check the error stack to find out why. + +-=item 1 ++=item C<1> + + The operation succeeded. + +diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_set_session.pod openssl-1.0.1e/doc/ssl/SSL_set_session.pod +--- openssl-1.0.1e.orig/doc/ssl/SSL_set_session.pod 2013-06-06 14:35:15.870871842 +0100 ++++ openssl-1.0.1e/doc/ssl/SSL_set_session.pod 2013-06-06 14:35:25.855746315 +0100 +@@ -37,11 +37,11 @@ + + =over 4 + +-=item 0 ++=item C<0> + + The operation failed; check the error stack to find out the reason. + +-=item 1 ++=item C<1> + + The operation succeeded. + +diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_shutdown.pod openssl-1.0.1e/doc/ssl/SSL_shutdown.pod +--- openssl-1.0.1e.orig/doc/ssl/SSL_shutdown.pod 2013-06-06 14:35:15.870871842 +0100 ++++ openssl-1.0.1e/doc/ssl/SSL_shutdown.pod 2013-06-06 14:35:25.857746290 +0100 +@@ -92,12 +92,12 @@ + + =over 4 + +-=item 1 ++=item C<1> + + The shutdown was successfully completed. The "close notify" alert was sent + and the peer's "close notify" alert was received. + +-=item 0 ++=item C<0> + + The shutdown is not yet finished. Call SSL_shutdown() for a second time, + if a bidirectional shutdown shall be performed. +diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_write.pod openssl-1.0.1e/doc/ssl/SSL_write.pod +--- openssl-1.0.1e.orig/doc/ssl/SSL_write.pod 2013-06-06 14:35:15.870871842 +0100 ++++ openssl-1.0.1e/doc/ssl/SSL_write.pod 2013-06-06 14:35:25.865746189 +0100 +@@ -79,7 +79,7 @@ + The write operation was successful, the return value is the number of + bytes actually written to the TLS/SSL connection. + +-=item 0 ++=item C<0> + + The write operation was not successful. Probably the underlying connection + was closed. Call SSL_get_error() with the return value B<ret> to find out, diff --git a/core/openvpn/PKGBUILD b/core/openvpn/PKGBUILD index 929a98c7f..e69405d48 100644 --- a/core/openvpn/PKGBUILD +++ b/core/openvpn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188197 2013-06-12 15:53:27Z thomas $ +# $Id: PKGBUILD 197835 2013-10-30 11:06:16Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=openvpn @@ -24,7 +24,6 @@ md5sums=('06e5f93dbf13f2c19647ca15ffc23ac1' 'SKIP' '57ef7353ba2c28c04dfc387c3ca77a4f' 'e1bd1523e38745e948c710db1a330bb1') -options=(!libtool) build() { cd $srcdir/$pkgname-$pkgver diff --git a/core/pam/PKGBUILD b/core/pam/PKGBUILD index a562da503..bcb75977e 100644 --- a/core/pam/PKGBUILD +++ b/core/pam/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186139 2013-05-21 09:11:14Z tpowa $ +# $Id: PKGBUILD 197836 2013-10-30 11:06:23Z allan $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=pam -pkgver=1.1.6 -pkgrel=4 +pkgver=1.1.8 +pkgrel=2 pkgdesc="PAM (Pluggable Authentication Modules) library" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -15,23 +15,26 @@ backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespac source=(https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$pkgver.tar.bz2 #http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2 ftp://ftp.archlinux.org/other/pam_unix2/pam_unix2-2.9.1.tar.bz2 - pam_unix2-glibc216.patch - pam_namespace-build-1.1.6.patch) -options=('!libtool' '!emptydirs') -md5sums=('7b73e58b7ce79ffa321d408de06db2c4' + pam_unix2-glibc216.patch) +options=('!emptydirs') +md5sums=('35b6091af95981b1b2cd60d813b5e4ee' 'da6a46e5f8cd3eaa7cbc4fc3a7e2b555' - 'dac109f68e04a4df37575fda6001ea17' - '440a510164ba5eb69bf41e129746ff44') + 'dac109f68e04a4df37575fda6001ea17') build() { cd $srcdir/Linux-PAM-$pkgver ./configure --libdir=/usr/lib --sbindir=/usr/bin - patch -Np0 -i ../pam_namespace-build-1.1.6.patch make cd $srcdir/pam_unix2-2.9.1 patch -Np1 -i ../pam_unix2-glibc216.patch - ./configure --libdir=/usr/lib --sbindir=/usr/bin + + # modify flags to build against the pam compiled here, not a system lib. + ./configure \ + CFLAGS="$CFLAGS -I$srcdir/Linux-PAM-$pkgver/libpam/include/" \ + LDFLAGS="$LDFLAGS -L$srcdir/Linux-PAM-$pkgver/libpam/.libs/" \ + --libdir=/usr/lib \ + --sbindir=/usr/bin make } diff --git a/core/pam/pam.install b/core/pam/pam.install deleted file mode 100644 index 9d4588084..000000000 --- a/core/pam/pam.install +++ /dev/null @@ -1,12 +0,0 @@ -# arg 1: the new package version -post_install() { - # need to run this immediately -- pacman only runs it at the end of - # all package installs - /sbin/ldconfig -r . -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} diff --git a/core/pam/pam_namespace-build-1.1.6.patch b/core/pam/pam_namespace-build-1.1.6.patch deleted file mode 100644 index aeabc234c..000000000 --- a/core/pam/pam_namespace-build-1.1.6.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/pam_namespace/Makefile~ 2012-10-12 10:59:13.557550706 +0200 -+++ modules/pam_namespace/Makefile 2012-10-12 10:59:13.564217270 +0200 -@@ -869,7 +869,7 @@ - - - install-data-local: -- mkdir -p $(namespaceddir) -+ mkdir -p $(DESTDIR)$(namespaceddir) - README: pam_namespace.8.xml namespace.conf.5.xml - -include $(top_srcdir)/Make.xml.rules - diff --git a/core/pciutils/PKGBUILD b/core/pciutils/PKGBUILD index 960c043e4..cb47cdaf7 100644 --- a/core/pciutils/PKGBUILD +++ b/core/pciutils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 186143 2013-05-21 09:11:35Z tpowa $ +# $Id: PKGBUILD 197782 2013-10-30 07:26:12Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=pciutils pkgver=3.2.0 -pkgrel=3 +pkgrel=4 pkgdesc="PCI bus configuration space access library and tools" arch=(i686 x86_64 'mips64el') license=('GPL2') diff --git a/core/pcre/PKGBUILD b/core/pcre/PKGBUILD index 0d96d3182..35cc57f83 100644 --- a/core/pcre/PKGBUILD +++ b/core/pcre/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 187186 2013-06-05 04:57:31Z allan $ +# $Id: PKGBUILD 197154 2013-10-23 13:04:19Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=pcre pkgver=8.33 -pkgrel=1 +pkgrel=2 pkgdesc="A library that implements Perl 5-style regular expressions" arch=('i686' 'x86_64' 'mips64el') url="http://www.pcre.org/" license=('BSD') depends=('gcc-libs') -options=('!libtool') source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2{,.sig}) md5sums=('21514018448ac10062ece7a668fca949' 'SKIP') diff --git a/core/popt/PKGBUILD b/core/popt/PKGBUILD index 99df35922..b2e9a8883 100644 --- a/core/popt/PKGBUILD +++ b/core/popt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 195971 2013-10-06 19:11:33Z eric $ +# $Id: PKGBUILD 197837 2013-10-30 11:06:32Z allan $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=popt @@ -9,7 +9,6 @@ arch=('i686' 'x86_64' 'mips64el') url="http://rpm5.org" license=('custom') depends=('glibc') -options=('!libtool') source=(http://rpm5.org/files/${pkgname}/${pkgname}-${pkgver}.tar.gz) sha1sums=('cfe94a15a2404db85858a81ff8de27c8ff3e235e') diff --git a/core/procps-ng/PKGBUILD b/core/procps-ng/PKGBUILD index 9a0322d1a..b55947c1a 100644 --- a/core/procps-ng/PKGBUILD +++ b/core/procps-ng/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 194509 2013-09-17 03:04:40Z bisson $ +# $Id: PKGBUILD 197838 2013-10-30 11:06:38Z allan $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Eric Bélanger <eric@archlinux.org> @@ -19,7 +19,6 @@ conflicts=('procps') provides=('procps') replaces=('procps') -options=('!libtool') install=install build() { diff --git a/core/pth/PKGBUILD b/core/pth/PKGBUILD index 5c69dbceb..9a2b8a3a2 100644 --- a/core/pth/PKGBUILD +++ b/core/pth/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 146737 2012-01-16 22:52:42Z dreisner $ +# $Id: PKGBUILD 197839 2013-10-30 11:06:47Z allan $ # Maintainer: damir <damir@archlinux.org> pkgname=pth @@ -9,7 +9,7 @@ arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/pth/" license=('LGPL') depends=('glibc' 'awk') -options=('!libtool' '!makeflags') +options=('!makeflags') source=(ftp://ftp.gnu.org/gnu/pth/$pkgname-$pkgver.tar.gz{,.sig}) sha1sums=('9a71915c89ff2414de69fe104ae1016d513afeee' '8cb16dffbf15ba92bda8d08918eaf5995642fc38') diff --git a/core/readline/PKGBUILD b/core/readline/PKGBUILD index 43282abe3..4b62a61e6 100644 --- a/core/readline/PKGBUILD +++ b/core/readline/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163855 2012-07-21 11:22:57Z allan $ +# $Id: PKGBUILD 197153 2013-10-23 13:04:18Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> @@ -6,7 +6,7 @@ pkgname=readline _basever=6.2 _patchlevel=004 #prepare for some patches pkgver=$_basever.$_patchlevel -pkgrel=1 +pkgrel=2 pkgdesc="GNU readline library" arch=('i686' 'x86_64' 'mips64el') url="http://tiswww.case.edu/php/chet/readline/rltop.html" @@ -38,14 +38,14 @@ build() { cd ${srcdir}/${pkgname}-$_basever for (( p=1; p<=$((10#${_patchlevel})); p++ )); do msg "applying patch readline${_basever//./}-$(printf "%03d" $p)" - patch -Np0 -i $srcdir/readline${_basever//./}-$(printf "%03d" $p) + patch -p0 -i $srcdir/readline${_basever//./}-$(printf "%03d" $p) done # Remove RPATH from shared objects (FS#14366) sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf # build with -fPIC for x86_64 (FS#15634) - [ $CARCH == "x86_64" ] && CFLAGS="$CFLAGS -fPIC" + [[ $CARCH == "x86_64" ]] && CFLAGS="$CFLAGS -fPIC" ./configure --prefix=/usr make SHLIB_LIBS=-lncurses diff --git a/core/s-nail/PKGBUILD b/core/s-nail/PKGBUILD index 7a685f014..f626cd410 100644 --- a/core/s-nail/PKGBUILD +++ b/core/s-nail/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 196202 2013-10-08 07:40:42Z bisson $ +# $Id: PKGBUILD 197187 2013-10-23 17:10:51Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s@arch@gmail.com> # Contributor: Andreas Wagner <Andreas.Wagner@em.uni-frankfurt.de> pkgname=s-nail -pkgver=14.4.4 +pkgver=14.4.5 pkgrel=1 pkgdesc='Mail processing system with a command syntax reminiscent of ed' url='http://sourceforge.net/projects/s-nail/' @@ -14,7 +14,7 @@ arch=('i686' 'x86_64' 'mips64el') depends=('openssl') optdepends=('smtp-forwarder: for sending mail') source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver//./_}.tar.gz") -sha1sums=('6aaa2ca4c269a073cdfd778de0f05d8eb2303737') +sha1sums=('cc972ddacdf9593739289eb0589ad0939255dfd7') groups=('base') backup=('etc/mail.rc') @@ -22,6 +22,11 @@ replaces=('mailx' 'mailx-heirloom' 'heirloom-mailx') provides=('mailx' 'mailx-heirloom' 'heirloom-mailx') conflicts=('mailx' 'mailx-heirloom' 'heirloom-mailx') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed 's/s-nail/mail/g' -i cc-test.sh +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" make \ @@ -30,20 +35,22 @@ build() { MANDIR=/usr/share/man \ MAILSPOOL=/var/spool/mail \ SID= NAIL=mail \ + config + make \ CFLAGS="${CFLAGS} ${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" \ - DESTDIR="${pkgdir}" \ - all + build } + check() { cd "${srcdir}/${pkgname}-${pkgver}" - #./cc-test.sh + make test } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make -f mk.mk install + make DESTDIR="${pkgdir}" packager-install ln -sf mail "${pkgdir}"/usr/bin/mailx ln -sf mail.1.gz "${pkgdir}"/usr/share/man/man1/mailx.1.gz install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" diff --git a/core/shadow/PKGBUILD b/core/shadow/PKGBUILD index 8500e395a..816678c68 100644 --- a/core/shadow/PKGBUILD +++ b/core/shadow/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 187042 2013-06-03 11:15:35Z allan $ +# $Id: PKGBUILD 197840 2013-10-30 11:06:53Z allan $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=shadow pkgver=4.1.5.1 -pkgrel=6 +pkgrel=7 pkgdesc="Password and account management tool suite with support for shadow files and PAM" arch=('i686' 'x86_64' 'mips64el') url='http://pkg-shadow.alioth.debian.org/' @@ -16,7 +16,7 @@ backup=(etc/login.defs etc/pam.d/{chpasswd,newusers,groupadd,groupdel,groupmod} etc/pam.d/{chgpasswd,groupmems} etc/default/useradd) -options=('!libtool') +options=(strip debug) install='shadow.install' source=("http://pkg-shadow.alioth.debian.org/releases/$pkgname-$pkgver.tar.bz2"{,.sig} LICENSE @@ -114,7 +114,7 @@ package() { # Remove utilities provided by util-linux rm \ - "$pkgdir"/usr/bin/{login,su,chsh,chfn,sg} \ + "$pkgdir"/usr/bin/{login,su,chsh,chfn,sg,nologin} \ "$pkgdir"/usr/sbin/{vipw,vigr} # but we keep newgrp, as sg is really an alias to it @@ -127,6 +127,7 @@ package() { -name 'su.1' -o \ -name 'logoutd.8' -o \ -name 'login.1' -o \ + -name 'nologin.8' -o \ -name 'vipw.8' -o \ -name 'vigr.8' -o \ -name 'newgrp.1' ')' \ diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD index 4d5450f9d..84511dd8a 100644 --- a/core/sudo/PKGBUILD +++ b/core/sudo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 195898 2013-10-04 13:41:05Z foutrelis $ +# $Id: PKGBUILD 197841 2013-10-30 11:07:01Z allan $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> @@ -14,7 +14,6 @@ license=('custom') groups=('base-devel') depends=('glibc' 'pam') backup=('etc/sudoers' 'etc/pam.d/sudo') -options=('!libtool') source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig} sudo.pam) sha256sums=('9f911c1e9297fb8006deb52fa81197a8d06b9d54e70672f723c467ecae992fc9' diff --git a/core/sysfsutils/PKGBUILD b/core/sysfsutils/PKGBUILD index a76eb10bf..e12494892 100644 --- a/core/sysfsutils/PKGBUILD +++ b/core/sysfsutils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 158624 2012-05-05 03:20:18Z dreisner $ +# $Id: PKGBUILD 197842 2013-10-30 11:07:08Z allan $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=sysfsutils @@ -12,7 +12,6 @@ groups=('base') depends=('glibc') source=(http://downloads.sourceforge.net/sourceforge/linux-diag/${pkgname}-${pkgver}.tar.gz) md5sums=('14e7dcd0436d2f49aa403f67e1ef7ddc') -options=(!libtool) build() { cd "$pkgname-$pkgver" diff --git a/core/systemd/0001-mount-check-for-NULL-before-reading-pm-what.patch b/core/systemd/0001-mount-check-for-NULL-before-reading-pm-what.patch new file mode 100644 index 000000000..27256484c --- /dev/null +++ b/core/systemd/0001-mount-check-for-NULL-before-reading-pm-what.patch @@ -0,0 +1,29 @@ +From 9c03872bc8fb2a381eafe7301ef9811b641686dd Mon Sep 17 00:00:00 2001 +From: Dave Reisner <dreisner@archlinux.org> +Date: Fri, 4 Oct 2013 18:22:40 -0400 +Subject: [PATCH] mount: check for NULL before reading pm->what + +Since a57f7e2c828b85, a mount unit with garbage in it would cause +systemd to crash on loading it. + +ref: https://bugs.freedesktop.org/show_bug.cgi?id=70148 +--- + src/core/mount.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/mount.c b/src/core/mount.c +index 93bfa99..db055f0 100644 +--- a/src/core/mount.c ++++ b/src/core/mount.c +@@ -182,7 +182,7 @@ static int mount_add_mount_links(Mount *m) { + * for the source path (if this is a bind mount) to be + * available. */ + pm = get_mount_parameters_fragment(m); +- if (pm && path_is_absolute(pm->what)) { ++ if (pm && pm->what && path_is_absolute(pm->what)) { + r = unit_require_mounts_for(UNIT(m), pm->what); + if (r < 0) + return r; +-- +1.8.4.1 + diff --git a/core/systemd/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch b/core/systemd/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch new file mode 100644 index 000000000..8c8ea46c2 --- /dev/null +++ b/core/systemd/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch @@ -0,0 +1,50 @@ +From 1d5989fd803d2019de0f6aaaf3cfb1cb2bbc3cdb Mon Sep 17 00:00:00 2001 +From: Dave Reisner <dreisner@archlinux.org> +Date: Sun, 6 Oct 2013 18:26:23 -0400 +Subject: [PATCH] shared/util: fix off-by-one error in tag_to_udev_node + +Triggered false negatives when encoding a string which needed every +character to be escaped, e.g. "LABEL=/". +--- + src/shared/util.c | 2 +- + src/test/test-device-nodes.c | 4 +++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/shared/util.c b/src/shared/util.c +index 82f4221..31cea79 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -3527,7 +3527,7 @@ static char *tag_to_udev_node(const char *tagvalue, const char *by) { + if (u == NULL) + return NULL; + +- enc_len = strlen(u) * 4; ++ enc_len = strlen(u) * 4 + 1; + t = new(char, enc_len); + if (t == NULL) + return NULL; +diff --git a/src/test/test-device-nodes.c b/src/test/test-device-nodes.c +index 2f3dedb..59ba4be 100644 +--- a/src/test/test-device-nodes.c ++++ b/src/test/test-device-nodes.c +@@ -26,7 +26,7 @@ + + /* helpers for test_encode_devnode_name */ + static char *do_encode_string(const char *in) { +- size_t out_len = strlen(in) * 4; ++ size_t out_len = strlen(in) * 4 + 1; + char *out = malloc(out_len); + + assert_se(out); +@@ -46,6 +46,8 @@ static void test_encode_devnode_name(void) { + assert_se(expect_encoded_as("pinkiepie", "pinkiepie")); + assert_se(expect_encoded_as("valíd\\ųtf8", "valíd\\x5cųtf8")); + assert_se(expect_encoded_as("s/ash/ng", "s\\x2fash\\x2fng")); ++ assert_se(expect_encoded_as("/", "\\x2f")); ++ assert_se(expect_encoded_as("!", "\\x21")); + } + + int main(int argc, char *argv[]) { +-- +1.8.4.1 + diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index e25d29d5f..d8855ba6c 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -4,27 +4,33 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') pkgver=208 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/systemd" makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf' 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libmicrohttpd' 'libxslt' 'linux-api-headers' 'pam' 'python' 'quota-tools' 'xz') -options=('!libtool' 'strip' 'debug' '!distcc') +options=('strip' 'debug') source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-hook-udev' 'initcpio-install-systemd' 'initcpio-install-udev' - '0001-fix-lingering-references-to-var-lib-backlight-random.patch') + '0001-fix-lingering-references-to-var-lib-backlight-random.patch' + '0001-mount-check-for-NULL-before-reading-pm-what.patch' + '0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch') md5sums=('df64550d92afbffb4f67a434193ee165' '29245f7a240bfba66e2b1783b63b6b40' '8b68b0218a3897d4d37a6ccf47914774' 'bde43090d4ac0ef048e3eaee8202a407' - '1b191c4e7a209d322675fd199e3abc66') + '1b191c4e7a209d322675fd199e3abc66' + 'a693bef63548163ffc165f4c4801ebf7' + 'ccafe716d87df9c42af0d1960b5a4105') prepare() { cd "$pkgname-$pkgver" - patch -Np1 -i ../0001-fix-lingering-references-to-var-lib-backlight-random.patch + patch -Np1 < "$srcdir"/0001-fix-lingering-references-to-var-lib-backlight-random.patch + patch -Np1 < "$srcdir"/0001-mount-check-for-NULL-before-reading-pm-what.patch + patch -Np1 < "$srcdir"/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch } build() { @@ -48,8 +54,7 @@ build() { } check() { - # two tests fail due to running under nspawn - make -C "$pkgname-$pkgver" check || true + make -C "$pkgname-$pkgver" check || : } package_systemd() { @@ -73,6 +78,7 @@ package_systemd() { etc/dbus-1/system.d/org.freedesktop.locale1.conf etc/dbus-1/system.d/org.freedesktop.machine1.conf etc/dbus-1/system.d/org.freedesktop.timedate1.conf + etc/pam.d/systemd-user etc/systemd/bootchart.conf etc/systemd/journald.conf etc/systemd/logind.conf @@ -121,7 +127,7 @@ package_systemd() { "$srcdir"/_sysvcompat/usr/share/man/man8 # include MIT license, since it's technically custom - install -Dm755 "$srcdir/$pkgname-$pkgver/LICENSE.MIT" \ + install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE.MIT" \ "$pkgdir/usr/share/licenses/systemd/LICENSE.MIT" } diff --git a/core/systemd/systemd.install b/core/systemd/systemd.install index f22536360..1e79585d7 100644 --- a/core/systemd/systemd.install +++ b/core/systemd/systemd.install @@ -69,7 +69,7 @@ post_upgrade() { if [ "$(vercmp 183 "$2")" -eq 1 ]; then # systemctl seems to be whiny on sysvinit. this will succeed unless something # horrific happens, so just mask the error. - systemctl -q enable getty@.service || true + systemctl -q enable getty@tty1.service || true fi if [ "$(vercmp 194-4 "$2")" -eq 1 ]; then diff --git a/core/sysvinit-tools/PKGBUILD b/core/sysvinit-tools/PKGBUILD index a576e6a05..4dc356e74 100644 --- a/core/sysvinit-tools/PKGBUILD +++ b/core/sysvinit-tools/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 187044 2013-06-03 11:15:38Z allan $ +# $Id: PKGBUILD 197264 2013-10-24 20:11:17Z dreisner $ # Maintainer: Tom Gundersen <teg@jklm.no> # Maintainer: Eric Belanger <eric@archlinux.org> pkgname=sysvinit-tools +pkgdesc="Linux System V Init Tools" pkgver=2.88 -pkgrel=11 +pkgrel=12 arch=('i686' 'x86_64' 'mips64el') url="http://savannah.nongnu.org/projects/sysvinit" license=('GPL') @@ -17,33 +18,25 @@ sha1sums=('f2ca149df1314a91f3007cccd7a0aa47d990de26' 'bbecfa7dfa45ac7c37ed8ac59fb53f6a85064b32') build() { - cd "${srcdir}/sysvinit-${pkgver}dsf" + cd "$srcdir/sysvinit-${pkgver}dsf" # FS#30005 patch -p1 -d "src" -i "${srcdir}/0001-simplify-writelog.patch" patch -p1 -d "src" -i "${srcdir}/0002-remove-ansi-escape-codes-from-log-file.patch" - make + # only build what we need... + make -C src fstab-decode killall5 bootlogd } package() { - pkgdesc="Linux System V Init Tools" - - cd "${srcdir}/sysvinit-${pkgver}dsf" - make ROOT="${pkgdir}" install - - cd "${pkgdir}" - ### drop the stuff provided by systemd-sysvcompat and util-linux - rm -r usr/share/man/man5 - rm -r usr/include - rm bin/mountpoint - rm sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit,sulogin} - rm usr/bin/{mesg,utmpdump,wall} - rm usr/share/man/man1/{mountpoint,mesg,utmpdump,wall}.1 - rm usr/share/man/man8/{halt,init,poweroff,reboot,runlevel,shutdown,telinit,sulogin}.8 - ### usrmerge - mv sbin/* usr/bin/ - rm -r sbin - mv bin/* usr/bin/ - rm -r bin + cd "$srcdir/sysvinit-${pkgver}dsf" + + install -dm755 "$pkgdir/usr/bin" "$pkgdir/usr/share/man/man8" + + # binaries + install -m755 src/{fstab-decode,killall5,bootlogd} "$pkgdir/usr/bin" + ln -s killall5 "$pkgdir/usr/bin/pidof" + + # manpages + install -m644 man/{bootlogd,pidof,killall5,fstab-decode}.8 "$pkgdir/usr/share/man/man8" } diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index ee267fb16..ec5086bb4 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 192147 2013-08-06 13:08:02Z tomegun $ +# $Id: PKGBUILD 197844 2013-10-30 11:07:21Z allan $ # Maintainer: Tom Gundersen <teg@jklm.no> # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux -pkgver=2.23.2 +pkgver=2.24 pkgrel=1 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64' 'mips64el') groups=('base' 'base-devel') depends=('pam' 'shadow' 'coreutils' 'glibc') -makedepends=('systemd') +optdepends=('python: python bindings to libmount') +makedepends=('systemd' 'python') # checkdepends=('bc') conflicts=('util-linux-ng' 'eject') provides=("util-linux-ng=$pkgver" 'eject') license=('GPL2') -options=('!libtool') -source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.23/$pkgname-$pkgver.tar.xz" +options=('strip' 'debug') +source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.24/$pkgname-$pkgver.tar.xz" uuidd.tmpfiles pam-login pam-common @@ -28,7 +29,7 @@ backup=(etc/pam.d/chfn etc/pam.d/su etc/pam.d/su-l) install=util-linux.install -md5sums=('b39fde897334a4858bb2098edcce5b3f' +md5sums=('4fac6443427f575fc5f3531a4ad2ca01' 'a39554bfd65cccfd8254bb46922f4a67' '4368b3f98abd8a32662e094c54e7f9b1' 'a31374fef2cba0ca34dfc7078e2969e4' @@ -39,6 +40,7 @@ build() { ./configure --prefix=/usr \ --libdir=/usr/lib \ + --bindir=/usr/bin \ --localstatedir=/run \ --enable-fs-paths-extra=/usr/bin \ --enable-raw \ @@ -47,10 +49,10 @@ build() { --enable-chfn-chsh \ --enable-write \ --enable-mesg \ - --enable-socket-activation + --enable-socket-activation \ + --with-python=3 # --enable-reset \ # part of ncurses -# --enable-line \ # not part of any package # --enable-last \ # not compat make @@ -83,6 +85,5 @@ package() { # usrmove cd "$pkgdir" mv {,usr/}sbin/* usr/bin - mv bin/* usr/bin - rmdir bin sbin usr/sbin + rmdir sbin usr/sbin } diff --git a/core/vi/PKGBUILD b/core/vi/PKGBUILD index ca5eaf501..61eef6950 100644 --- a/core/vi/PKGBUILD +++ b/core/vi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 171607 2012-11-20 05:26:38Z eric $ +# $Id: PKGBUILD 197845 2013-10-30 11:07:27Z allan $ # Maintainer: tobias [ tobias at archlinux org ] pkgname=vi @@ -12,7 +12,7 @@ license=('custom:ex') depends=('ncurses') optdepends=('heirloom-mailx: used by the preserve command for notification') groups=('base') -options=(strip !libtool emptydirs) +options=(strip emptydirs) source=(http://downloads.sourceforge.net/sourceforge/ex-vi/ex-${pkgver}.tar.bz2 navkeys.patch increase-tube.patch diff --git a/core/xfsprogs/PKGBUILD b/core/xfsprogs/PKGBUILD index eeb8d3b10..ae080fc7e 100644 --- a/core/xfsprogs/PKGBUILD +++ b/core/xfsprogs/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 186296 2013-05-24 07:56:54Z tpowa $ +# $Id: PKGBUILD 197846 2013-10-30 11:07:35Z allan $ # pkgname=xfsprogs pkgver=3.1.11 -pkgrel=1 +pkgrel=2 pkgdesc="XFS filesystem utilities" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') url="http://oss.sgi.com/projects/xfs/" groups=('base') depends=('util-linux') -options=('!makeflags' '!libtool') +options=('!makeflags') # We mirror the sources as upstream tends to move them once a new release is out source=("ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${pkgver}.tar.gz") md5sums=('de9f1f45026c2f4e0776058d429ff4b6') diff --git a/core/xinetd/PKGBUILD b/core/xinetd/PKGBUILD index fbdf3d48d..d16106d9c 100644 --- a/core/xinetd/PKGBUILD +++ b/core/xinetd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186292 2013-05-24 07:53:31Z tpowa $ +# $Id: PKGBUILD 196783 2013-10-19 06:36:43Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Judd <jvinet@zeroflux.org> pkgname=xinetd pkgver=2.3.15 -pkgrel=3 +pkgrel=4 pkgdesc="A secure replacement for inetd" arch=('i686' 'x86_64' 'mips64el') url="http://www.xinetd.org/" @@ -15,16 +15,21 @@ source=(http://www.xinetd.org/xinetd-$pkgver.tar.gz xinetd.conf servers services - xinetd.service) + xinetd.service + fix-CVE-2013-4342.patch) md5sums=('77358478fd58efa6366accae99b8b04c' 'f109f699a07bc8cfb5791060f5e87f9e' '21f47b4aa20921cfaddddd9f9a407f81' '9fa2061dc7dd738c8424251deb86f81e' - '38be35b6e7146dc59902e243d9063b4c') + '38be35b6e7146dc59902e243d9063b4c' + 'b14615c73753ceffbcc96d5e08f3c18d') prepare() { cd $srcdir/$pkgname-$pkgver sed -i "s#${prefix}/man#${prefix}/share/man#" configure + # fix #37310 + # https://bugzilla.redhat.com/show_bug.cgi?id=1006100#c + patch -Np1 -i $srcdir/fix-CVE-2013-4342.patch } build() { diff --git a/core/xinetd/fix-CVE-2013-4342.patch b/core/xinetd/fix-CVE-2013-4342.patch new file mode 100644 index 000000000..83506c9c3 --- /dev/null +++ b/core/xinetd/fix-CVE-2013-4342.patch @@ -0,0 +1,13 @@ +diff --git a/xinetd/builtins.c b/xinetd/builtins.c +index e61502f..a414cf3 100644 +--- a/xinetd/builtins.c ++++ b/xinetd/builtins.c +@@ -695,7 +695,7 @@ static void tcpmux_handler( const struct server *serp ) + if( SC_IS_INTERNAL( scp ) ) { + SC_INTERNAL(scp, nserp); + } else { +- exec_server(nserp); ++ child_process(nserp); + } + } + diff --git a/core/xz/PKGBUILD b/core/xz/PKGBUILD index 33e7da05b..2d5da080c 100644 --- a/core/xz/PKGBUILD +++ b/core/xz/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 189703 2013-07-05 05:55:43Z pierre $ +# $Id: PKGBUILD 197167 2013-10-23 13:51:52Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> # Contributor: François Charette <firmicus@gmx.net> pkgname=xz pkgver=5.0.5 -pkgrel=1 +pkgrel=2 pkgdesc='Library and command line tools for XZ and LZMA compressed files' arch=('i686' 'x86_64' 'mips64el') url='http://tukaani.org/xz/' license=('GPL' 'LGPL' 'custom') depends=('sh') -options=('!libtool') source=("http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz" "http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig") md5sums=('19d924e066b6fff0bc9d1981b4e53196' diff --git a/core/zlib/PKGBUILD b/core/zlib/PKGBUILD index bc6d05080..19e2cf8ba 100644 --- a/core/zlib/PKGBUILD +++ b/core/zlib/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 184034 2013-05-02 08:15:23Z pierre $ +# $Id: PKGBUILD 197152 2013-10-23 13:04:17Z allan $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=zlib pkgver=1.2.8 -pkgrel=1 +pkgrel=3 pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP' arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://www.zlib.net/" depends=('glibc') +options=('staticlibs') # needed by binutils testsuite source=("http://zlib.net/current/zlib-${pkgver}.tar.gz") md5sums=('44d667c142d7cda120332623eab69f40') +prepare() { + cd ${srcdir}/zlib-$pkgver + grep -A 24 '^ Copyright' zlib.h > LICENSE +} + build() { cd ${srcdir}/zlib-$pkgver ./configure --prefix=/usr make - - grep -A 24 '^ Copyright' zlib.h > LICENSE } check() { |