diff options
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/libarchive/PKGBUILD | 31 | ||||
| -rw-r--r-- | testing/openssl/PKGBUILD | 15 | ||||
| -rw-r--r-- | testing/openssl/disable-tls12-client.patch | 36 | ||||
| -rw-r--r-- | testing/util-linux/PKGBUILD | 18 | ||||
| -rw-r--r-- | testing/xz/PKGBUILD | 42 | ||||
| -rw-r--r-- | testing/xz/compile-fix.patch | 28 |
6 files changed, 131 insertions, 39 deletions
diff --git a/testing/libarchive/PKGBUILD b/testing/libarchive/PKGBUILD index 5533afa39..7fcdc2f68 100644 --- a/testing/libarchive/PKGBUILD +++ b/testing/libarchive/PKGBUILD @@ -1,39 +1,20 @@ -# $Id: PKGBUILD 151513 2012-02-27 05:06:31Z dreisner $ +# $Id: PKGBUILD 154654 2012-03-30 15:54:01Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=libarchive -pkgver=3.0.3 -pkgrel=5 +pkgver=3.0.4 +pkgrel=1 pkgdesc="library that can create and read several streaming archive formats" arch=('i686' 'x86_64') url="http://libarchive.googlecode.com/" license=('BSD') depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat') -source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz" - 'interpret-non-posix-zips.patch' - 'test-with-zip-mtime.patch' - 'skip-fiemap-on-unavail.patch') -md5sums=('ca4090f0099432a9ac5a8b6618dc3892' - 'f02b88eb10877c7a7d527ed89c662e44' - '8366def6d7d70d424fa28a986c78c015' - 'efa7cbda9fc64a4f1392324d0b5707e2') -sha256sums=('c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7' - '9d8240a360d61464dfc5a98342f520ad41b0f922261f2ace7ec1fefb8c289bdc' - 'b7a8be5c1e3220960a9f67c9779b10d2663e25d72939546b4f01a49f1ee3a61f' - '05696eb87bf60520aff3a9d6afb4e40273ecca25e0a01a6d5a3669642f07b444') +source=("https://github.com/downloads/libarchive/libarchive/libarchive-${pkgver}.tar.gz") +md5sums=('af443ca9a10ddbcbf00f7ae34ca7fc16') +sha256sums=('76e8d7c7b100ec4071e48c1b7d3f3ea1d22b39db3e45b7189f75b5ff4df90fac') build() { cd "$srcdir/$pkgname-$pkgver" - - # http://code.google.com/p/libarchive/issues/detail?id=225 - patch -Np0 <"$srcdir/interpret-non-posix-zips.patch" - - # http://code.google.com/p/libarchive/issues/detail?id=231 - patch -Np0 <"$srcdir/test-with-zip-mtime.patch" - - # http://code.google.com/p/libarchive/issues/detail?id=238 - patch -Np1 <"$srcdir/skip-fiemap-on-unavail.patch" - ./configure --prefix=/usr --without-xml2 make } diff --git a/testing/openssl/PKGBUILD b/testing/openssl/PKGBUILD index 37dcf5c27..4dc7bc248 100644 --- a/testing/openssl/PKGBUILD +++ b/testing/openssl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 153487 2012-03-14 23:42:13Z pierre $ +# $Id: PKGBUILD 154554 2012-03-30 08:24:50Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=openssl @@ -6,7 +6,7 @@ _ver=1.0.1 # use a pacman compatible version scheme # pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} pkgver=$_ver -pkgrel=1 +pkgrel=2 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security' arch=('i686' 'x86_64') url='https://www.openssl.org' @@ -19,12 +19,14 @@ source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz" "https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc" 'fix-manpages.patch' 'no-rpath.patch' - 'ca-dir.patch') + 'ca-dir.patch' + 'disable-tls12-client.patch') md5sums=('134f168bc2a8333f19f81d684841710b' 'efbe93c11747fed52e60567819409d8a' '5bbc0655bda2af95bc8eb568963ce8ba' 'dc78d3d06baffc16217519242ce92478' - '3bf51be3a1bbd262be46dc619f92aa90') + '3bf51be3a1bbd262be46dc619f92aa90' + '26432b9d7af63c63828b6405c9185400') build() { cd $srcdir/$pkgname-$_ver @@ -44,11 +46,14 @@ build() { patch -p0 -i $srcdir/no-rpath.patch # set ca dir to /etc/ssl by default patch -p0 -i $srcdir/ca-dir.patch + # workaround for PR#2771 + patch -p1 -i $srcdir/disable-tls12-client.patch # mark stack as non-executable: http://bugs.archlinux.org/task/12434 ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \ shared zlib enable-md2 ${optflags} \ "${openssltarget}" \ - -Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}" + -Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}" \ + -DOPENSSL_NO_TLS1_2_CLIENT make depend make diff --git a/testing/openssl/disable-tls12-client.patch b/testing/openssl/disable-tls12-client.patch new file mode 100644 index 000000000..edb87e77f --- /dev/null +++ b/testing/openssl/disable-tls12-client.patch @@ -0,0 +1,36 @@ +Index: openssl/ssl/t1_lib.c +RCS File: /v/openssl/cvs/openssl/ssl/t1_lib.c,v +rcsdiff -q -kk '-r1.64.2.14.2.31' '-r1.64.2.14.2.32' -u '/v/openssl/cvs/openssl/ssl/t1_lib.c,v' 2>/dev/null +--- t1_lib.c 2012/02/27 16:38:10 1.64.2.14.2.31 ++++ t1_lib.c 2012/03/21 21:32:57 1.64.2.14.2.32 +@@ -544,7 +544,7 @@ + } + skip_ext: + +- if (TLS1_get_version(s) >= TLS1_2_VERSION) ++ if (TLS1_get_client_version(s) >= TLS1_2_VERSION) + { + if ((size_t)(limit - ret) < sizeof(tls12_sigalgs) + 6) + return NULL; +Index: openssl/ssl/s23_clnt.c +RCS File: /v/openssl/cvs/openssl/ssl/s23_clnt.c,v +rcsdiff -q -kk '-r1.43.2.4.2.5' '-r1.43.2.4.2.6' -u '/v/openssl/cvs/openssl/ssl/s23_clnt.c,v' 2>/dev/null +--- s23_clnt.c 2011/05/19 18:22:15 1.43.2.4.2.5 ++++ s23_clnt.c 2012/03/29 19:08:54 1.43.2.4.2.6 +@@ -287,12 +287,14 @@ + + if (ssl2_compat && ssl23_no_ssl2_ciphers(s)) + ssl2_compat = 0; +- ++#ifndef OPENSSL_NO_TLS1_2_CLIENT + if (!(s->options & SSL_OP_NO_TLSv1_2)) + { + version = TLS1_2_VERSION; + } +- else if (!(s->options & SSL_OP_NO_TLSv1_1)) ++ else ++#endif ++ if (!(s->options & SSL_OP_NO_TLSv1_1)) + { + version = TLS1_1_VERSION; + } diff --git a/testing/util-linux/PKGBUILD b/testing/util-linux/PKGBUILD index eb3009f42..cc985d238 100644 --- a/testing/util-linux/PKGBUILD +++ b/testing/util-linux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 153562 2012-03-16 02:37:59Z dreisner $ +# $Id: PKGBUILD 154829 2012-03-30 22:42:03Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux -pkgver=2.21 -pkgrel=6 +pkgver=2.21.1 +pkgrel=1 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64') @@ -14,8 +14,7 @@ conflicts=('util-linux-ng') provides=("util-linux-ng=${pkgver}") license=('GPL2') options=('!libtool') -source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar.xz - stable-fixes-2.21.patch) +source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.21/${pkgname}-${pkgver}.tar.xz) optdepends=('perl: for chkdupexe support') build() { @@ -24,8 +23,6 @@ build() { # hardware clock sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h - patch -p1 -i ../stable-fixes-2.21.patch - ./configure --prefix=/usr \ --libdir=/usr/lib \ --enable-write \ @@ -36,6 +33,10 @@ build() { make } +check() { + make -C "$pkgname-$pkgver" check +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -48,5 +49,4 @@ package() { # delete stray empty dir, fixed upstream rm -r usr/share/man/ru } -md5sums=('208aa058f4117759d2939d1be7d662fc' - '415b850a4efa9174cd9c34022949f177') +md5sums=('ad602dcd528f340b1329cfa6200d8f80') diff --git a/testing/xz/PKGBUILD b/testing/xz/PKGBUILD new file mode 100644 index 000000000..8b76f6420 --- /dev/null +++ b/testing/xz/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 154765 2012-03-30 16:41:04Z pierre $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> +# Contributor: François Charette <firmicus@gmx.net> + +pkgname=xz +pkgver=5.0.3 +pkgrel=2 +pkgdesc='Library and command line tools for XZ and LZMA compressed files' +arch=('i686' 'x86_64') +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" + 'compile-fix.patch') +md5sums=('fefe52f9ecd521de2a8ce38c21a27574' + 'd0725667a6dae0853194dc691e900e26' + 'b74e4f7793848cc5765c848ea30f971f') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + patch -p1 -i ${srcdir}/compile-fix.patch + + ./configure --prefix=/usr \ + --disable-rpath \ + --enable-werror + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + install -d -m755 ${pkgdir}/usr/share/licenses/xz/ + ln -sf /usr/share/doc/xz/COPYING ${pkgdir}/usr/share/licenses/xz/ + ln -sf /usr/share/licenses/common/GPL2/license.txt ${pkgdir}/usr/share/doc/xz/COPYING.GPLv2 +} diff --git a/testing/xz/compile-fix.patch b/testing/xz/compile-fix.patch new file mode 100644 index 000000000..f3b7878d1 --- /dev/null +++ b/testing/xz/compile-fix.patch @@ -0,0 +1,28 @@ +From 7db6bdf4abcf524115be2cf5659ed540cef074c5 Mon Sep 17 00:00:00 2001 +From: Lasse Collin <lasse.collin@tukaani.org> +Date: Tue, 10 Jan 2012 17:13:03 +0200 +Subject: [PATCH] Tests: Fix a compiler warning with _FORTIFY_SOURCE. + +Reported here: +http://sourceforge.net/projects/lzmautils/forums/forum/708858/topic/4927385 +--- + tests/create_compress_files.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/tests/create_compress_files.c b/tests/create_compress_files.c +index 44367d8..bd5b4ef 100644 +--- a/tests/create_compress_files.c ++++ b/tests/create_compress_files.c +@@ -79,7 +79,8 @@ static void + write_abc(FILE *file) + { + for (size_t i = 0; i < 12345; ++i) +- fwrite("abc\n", 4, 1, file); ++ if (fwrite("abc\n", 4, 1, file) != 1) ++ exit(1); + } + + +-- +1.7.6 + |