From 8ebbe4e4befac1396a153b356fc9793655dde4ff Mon Sep 17 00:00:00 2001 From: root Date: Mon, 2 Apr 2012 00:01:14 +0000 Subject: Mon Apr 2 00:01:14 UTC 2012 --- core/openssl/PKGBUILD | 15 +++++++++----- core/openssl/disable-tls12-client.patch | 36 +++++++++++++++++++++++++++++++++ core/xz/PKGBUILD | 19 +++++++++-------- core/xz/compile-fix.patch | 28 +++++++++++++++++++++++++ 4 files changed, 83 insertions(+), 15 deletions(-) create mode 100644 core/openssl/disable-tls12-client.patch create mode 100644 core/xz/compile-fix.patch (limited to 'core') diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD index d64577707..ff9fcc101 100644 --- a/core/openssl/PKGBUILD +++ b/core/openssl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 153962 2012-03-21 06:20:46Z pierre $ +# $Id: PKGBUILD 154941 2012-03-31 12:48:22Z pierre $ # Maintainer: Pierre Schmitz 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/core/openssl/disable-tls12-client.patch b/core/openssl/disable-tls12-client.patch new file mode 100644 index 000000000..edb87e77f --- /dev/null +++ b/core/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/core/xz/PKGBUILD b/core/xz/PKGBUILD index e2c47b128..f74c8ac58 100644 --- a/core/xz/PKGBUILD +++ b/core/xz/PKGBUILD @@ -1,27 +1,26 @@ -# $Id: PKGBUILD 124452 2011-05-21 17:48:29Z pierre $ +# $Id: PKGBUILD 154939 2012-03-31 12:48:19Z pierre $ # Maintainer: Pierre Schmitz # Contributor: François Charette pkgname=xz pkgver=5.0.3 -pkgrel=1 +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') -provides=('lzma' 'lzma-utils' 'xz-utils') -replaces=('lzma' 'lzma-utils' 'xz-utils') -conflicts=('lzma' 'lzma-utils' 'xz-utils') options=('!libtool') -source=("http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('fefe52f9ecd521de2a8ce38c21a27574') - -# keep an upgrade path for older installations -PKGEXT='.pkg.tar.gz' +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 \ diff --git a/core/xz/compile-fix.patch b/core/xz/compile-fix.patch new file mode 100644 index 000000000..f3b7878d1 --- /dev/null +++ b/core/xz/compile-fix.patch @@ -0,0 +1,28 @@ +From 7db6bdf4abcf524115be2cf5659ed540cef074c5 Mon Sep 17 00:00:00 2001 +From: Lasse Collin +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 + -- cgit v1.2.3-54-g00ecf