diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-02 18:56:43 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-02 18:56:43 +0200 |
commit | 16962179f9ea5c2875d55693396413b6e9bf8b6d (patch) | |
tree | 860d1ef78293947182f45a9e21021a27a26ced80 /core | |
parent | 4d800cff6e1b6460f7f4a7e737077c9064b0ed37 (diff) | |
parent | 321f44e3a5da426309c4b6664af035c97f907565 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/go/PKGBUILD
core/openssl/PKGBUILD
extra/libsigsegv/PKGBUILD
gnome-unstable/gnome-control-center/PKGBUILD
staging/boost/PKGBUILD
staging/kactivities/PKGBUILD
staging/kdeaccessibility-jovie/PKGBUILD
staging/kdeaccessibility-kaccessible/PKGBUILD
staging/kdeaccessibility-kmag/PKGBUILD
staging/kdeaccessibility-kmousetool/PKGBUILD
staging/kdeaccessibility-kmouth/PKGBUILD
staging/kdeadmin/PKGBUILD
staging/kdeartwork/PKGBUILD
staging/kdebase-konsole/PKGBUILD
staging/kdebase-runtime/PKGBUILD
staging/kdebase-workspace/PKGBUILD
staging/kdebase-workspace/kde-np.pam
staging/kdebase-workspace/kde.pam
staging/kdebase/PKGBUILD
staging/kdebindings-kimono/PKGBUILD
staging/kdebindings-korundum/PKGBUILD
staging/kdebindings-kross/PKGBUILD
staging/kdebindings-perlkde/PKGBUILD
staging/kdebindings-perlqt/PKGBUILD
staging/kdebindings-python/PKGBUILD
staging/kdebindings-qtruby/PKGBUILD
staging/kdebindings-qyoto/PKGBUILD
staging/kdebindings-smokegen/PKGBUILD
staging/kdebindings-smokekde/PKGBUILD
staging/kdebindings-smokeqt/PKGBUILD
staging/kdeedu-analitza/PKGBUILD
staging/kdeedu-blinken/PKGBUILD
staging/kdeedu-cantor/PKGBUILD
staging/kdeedu-kalgebra/PKGBUILD
staging/kdeedu-kalzium/PKGBUILD
staging/kdeedu-kanagram/PKGBUILD
staging/kdeedu-kbruch/PKGBUILD
staging/kdeedu-kgeography/PKGBUILD
staging/kdeedu-khangman/PKGBUILD
staging/kdeedu-kig/PKGBUILD
staging/kdeedu-kiten/PKGBUILD
staging/kdeedu-klettres/PKGBUILD
staging/kdeedu-kmplot/PKGBUILD
staging/kdeedu-kstars/PKGBUILD
staging/kdeedu-ktouch/PKGBUILD
staging/kdeedu-kturtle/PKGBUILD
staging/kdeedu-kwordquiz/PKGBUILD
staging/kdeedu-marble/PKGBUILD
staging/kdeedu-parley/PKGBUILD
staging/kdeedu-rocs/PKGBUILD
staging/kdeedu-step/PKGBUILD
staging/kdegames/PKGBUILD
staging/kdegraphics-gwenview/PKGBUILD
staging/kdegraphics-kamera/PKGBUILD
staging/kdegraphics-kcolorchooser/PKGBUILD
staging/kdegraphics-kgamma/PKGBUILD
staging/kdegraphics-kolourpaint/PKGBUILD
staging/kdegraphics-kruler/PKGBUILD
staging/kdegraphics-ksaneplugin/PKGBUILD
staging/kdegraphics-ksnapshot/PKGBUILD
staging/kdegraphics-mobipocket/PKGBUILD
staging/kdegraphics-okular/PKGBUILD
staging/kdegraphics-strigi-analyzer/PKGBUILD
staging/kdegraphics-svgpart/PKGBUILD
staging/kdegraphics-thumbnailers/PKGBUILD
staging/kdemultimedia/PKGBUILD
staging/kdenetwork/PKGBUILD
staging/kdepim-runtime/PKGBUILD
staging/kdepim/PKGBUILD
staging/kdepimlibs/PKGBUILD
staging/kdeplasma-addons/PKGBUILD
staging/kdesdk-kate/PKGBUILD
staging/kdesdk/PKGBUILD
staging/kdetoys/PKGBUILD
staging/kdeutils-filelight/PKGBUILD
staging/kdeutils-kcalc/PKGBUILD
staging/kdeutils-kcharselect/PKGBUILD
staging/kdeutils-kdf/PKGBUILD
staging/kdeutils-kfloppy/PKGBUILD
staging/kdeutils-kgpg/PKGBUILD
staging/kdeutils-kremotecontrol/PKGBUILD
staging/kdeutils-ksecrets/PKGBUILD
staging/kdeutils-ktimer/PKGBUILD
staging/kdeutils-kwallet/PKGBUILD
staging/kdeutils-superkaramba/PKGBUILD
staging/kdeutils-sweeper/PKGBUILD
staging/kdewebdev/PKGBUILD
staging/libkdcraw/PKGBUILD
staging/libkdeedu/PKGBUILD
staging/libkexiv2/PKGBUILD
staging/libkipi/PKGBUILD
staging/libksane/PKGBUILD
testing/e2fsprogs/PKGBUILD
testing/iptables/PKGBUILD
testing/ruby/PKGBUILD
testing/xorg-server/PKGBUILD
testing/xorg-server/autoconfig-nvidia.patch
testing/xorg-server/autoconfig-sis.patch
Diffstat (limited to 'core')
-rw-r--r-- | core/openssl/PKGBUILD | 15 | ||||
-rw-r--r-- | core/openssl/disable-tls12-client.patch | 36 | ||||
-rw-r--r-- | core/xz/PKGBUILD | 19 | ||||
-rw-r--r-- | core/xz/compile-fix.patch | 28 |
4 files changed, 83 insertions, 15 deletions
diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD index 0f0238e2d..4835d5941 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 <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' 'mips64el') url='https://www.openssl.org' @@ -19,12 +19,14 @@ source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz" 'fix-manpages.patch' 'no-rpath.patch' 'gnu-linux-mips64el-gcc.patch' - 'ca-dir.patch') + 'ca-dir.patch' + 'disable-tls12-client.patch') md5sums=('134f168bc2a8333f19f81d684841710b' '5bbc0655bda2af95bc8eb568963ce8ba' 'dc78d3d06baffc16217519242ce92478' 'd7115f0cc44df346d7b68c681819f94b' - '3bf51be3a1bbd262be46dc619f92aa90') + '3bf51be3a1bbd262be46dc619f92aa90' + '26432b9d7af63c63828b6405c9185400') build() { cd $srcdir/$pkgname-$_ver @@ -36,6 +38,8 @@ 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 # patch -p0 -i $srcdir/gnu-linux-mips64el-gcc.patch @@ -56,7 +60,8 @@ build() { ./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 cb1c045b3..b7cb6a04f 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 <pierre@archlinux.de> # Contributor: François Charette <firmicus@gmx.net> 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' 'mips64el') 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 <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 + |