diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | PKGBUILD | 9 | ||||
| -rw-r--r-- | python-2.6-ssl-nosslv3.patch | 14 |
4 files changed, 37 insertions, 9 deletions
@@ -1,7 +1,9 @@ +# Generated by mksrcinfo v8 +# Sun Mar 6 06:30:00 UTC 2016 pkgbase = python26 pkgdesc = Legacy version Python 2.6 of the high-level scripting language pkgver = 2.6.9 - pkgrel = 6 + pkgrel = 7 url = http://www.python.org/ changelog = ChangeLog arch = i686 @@ -30,6 +32,7 @@ pkgbase = python26 source = python-2.6-pyexpat-segfault.patch source = python-2.6-readline-6.3.patch source = python-2.6-sqlite-test.patch + source = python-2.6-ssl-nosslv3.patch source = python-2.6-tkinter-86.patch source = python-2.6-whichdb-gdbm-1.9.patch sha256sums = cae7bb995006ea5b703d9d28446f694894c441fe4bfb95d561c0ac908cd06e41 @@ -43,6 +46,7 @@ pkgbase = python26 sha256sums = 2aea683887955e59c6cff227a0d63aee3991571b7207a97d5985ba9ebd69e983 sha256sums = 5cc38033f7b7f7d6a25e63e14e9ae2de71bdf9106049e1cbad666bfe26d9cb7b sha256sums = 9c01e3bb264eaf6444b76ba6f5265d79bda234b5542fe3d2b478628412186c1e + sha256sums = 15bcbd12b6b103db67d828dbf50e22965dc3037297a88616725188b6576d25bb sha256sums = dbbc72d9c71c065fe3700af4322a130d5c5c459b6ee512f66e7e5eb9e4971171 sha256sums = e0dc2156ca821eaaada49cf5e1e301fc828215288aae648a6e7e4d4da1b38050 diff --git a/ChangeLog b/ChangeLog index bcfd038e8930..ca1f5215039f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,14 @@ -2015-02-01 Christopher Arndt <chris@chrisarndt.de> +2016-03-06 Christopher Arndt <aur -at- chrisarndt -dot- de> + + * 2.6.9-7 : + add patch to remove SSLv3 support in _ssl module (removed in OpenSSL) + +2015-02-01 Christopher Arndt <aur -at- chrisarndt -dot- de> * 2.6.9-6 : add patch for mhlib test failure (issue #7759) -2014-09-04 Christopher Arndt <chris@chrisarndt.de> +2014-09-04 Christopher Arndt <aur -at- chrisarndt -dot- de> * 2.6.9-5 : add arm architecture @@ -12,14 +17,14 @@ Add warning and abort build in 'check' function when run as root, since this triggers several test failures -2014-06-21 Christopher Arndt <chris@chrisarndt.de> +2014-06-21 Christopher Arndt <aur -at- chrisarndt -dot- de> * 2.6.9-4 : add patch for test_distutils for http://bugs.python.org/issue10126 source package and .AURINFO are now generated with mkaurball fix version number variable substitution in provides -2014-04-25 Christopher Arndt <chris@chrisarndt.de> +2014-04-25 Christopher Arndt <aur -at- chrisarndt -dot- de> * 2.6.9-3 : re-enable 'make test' in check function @@ -28,7 +33,7 @@ add patch for failure in test_sqlite with sqlite >= 3.8.4 add prepare function for applying patches -2014-04-18 Christopher Arndt <chris@chrisarndt.de> +2014-04-18 Christopher Arndt <aur -at- chrisarndt -dot- de> * 2.6.9-2 : no pattern substitution in variables in source URL for correct @@ -36,7 +41,7 @@ fix .AURINFO to include pkgrel in package version .AURINFO is now generated automatically and not included in sources -2014-04-16 Christopher Arndt <chris@chrisarndt.de> +2014-04-16 Christopher Arndt <aur -at- chrisarndt -dot- de> * 2.6.9-1 : update to upstream version 2.6.9 @@ -1,10 +1,10 @@ -# Maintainer: Christopher Arndt <aur -at- chrisarndt -dot- de> +# Maintainer: Christopher Arndt <aur -at- chrisarndt -dot- de> # Contributor: Rémy Oudompheng <remy@archlinux.org> # Contributor: Chris McDonald <xwraithanx@gmail.com> pkgname=python26 pkgver=2.6.9 -pkgrel=6 +pkgrel=7 _pybasever=2.6 pkgdesc="Legacy version Python 2.6 of the high-level scripting language" arch=('i686' 'x86_64' 'arm') @@ -26,6 +26,7 @@ source=(http://www.python.org/ftp/python/${pkgver}/Python-${pkgver}.tar.xz python-2.6-pyexpat-segfault.patch python-2.6-readline-6.3.patch python-2.6-sqlite-test.patch + python-2.6-ssl-nosslv3.patch python-2.6-tkinter-86.patch python-2.6-whichdb-gdbm-1.9.patch) sha256sums=('cae7bb995006ea5b703d9d28446f694894c441fe4bfb95d561c0ac908cd06e41' @@ -39,6 +40,7 @@ sha256sums=('cae7bb995006ea5b703d9d28446f694894c441fe4bfb95d561c0ac908cd06e41' '2aea683887955e59c6cff227a0d63aee3991571b7207a97d5985ba9ebd69e983' '5cc38033f7b7f7d6a25e63e14e9ae2de71bdf9106049e1cbad666bfe26d9cb7b' '9c01e3bb264eaf6444b76ba6f5265d79bda234b5542fe3d2b478628412186c1e' + '15bcbd12b6b103db67d828dbf50e22965dc3037297a88616725188b6576d25bb' 'dbbc72d9c71c065fe3700af4322a130d5c5c459b6ee512f66e7e5eb9e4971171' 'e0dc2156ca821eaaada49cf5e1e301fc828215288aae648a6e7e4d4da1b38050') @@ -67,6 +69,8 @@ prepare() { # http://bugs.python.org/issue20901 patch -Np1 -i ${srcdir}/python-2.6-sqlite-test.patch + patch -Np1 -i ${srcdir}/python-2.6-ssl-nosslv3.patch + patch -Np1 -i ${srcdir}/python-2.6-tkinter-86.patch # http://bugs.python.org/issue13007 @@ -82,6 +86,7 @@ build() { cd "${srcdir}/Python-${pkgver}" export OPT="${CFLAGS}" + export CPPFLAGS="-DOPENSSL_NO_SSL3" ./configure --prefix=/usr \ --enable-shared \ --enable-ipv6 \ diff --git a/python-2.6-ssl-nosslv3.patch b/python-2.6-ssl-nosslv3.patch new file mode 100644 index 000000000000..6e48f9ff3961 --- /dev/null +++ b/python-2.6-ssl-nosslv3.patch @@ -0,0 +1,14 @@ +diff -ur a/Modules/_ssl.c b/Modules/_ssl.c +--- a/Modules/_ssl.c 2013-10-29 16:04:38.000000000 +0100 ++++ b/Modules/_ssl.c 2016-03-06 07:01:17.303345390 +0100 +@@ -300,8 +300,10 @@ + PySSL_BEGIN_ALLOW_THREADS + if (proto_version == PY_SSL_VERSION_TLS1) + self->ctx = SSL_CTX_new(TLSv1_method()); /* Set up context */ ++#ifndef OPENSSL_NO_SSL3 + else if (proto_version == PY_SSL_VERSION_SSL3) + self->ctx = SSL_CTX_new(SSLv3_method()); /* Set up context */ ++#endif + #ifndef OPENSSL_NO_SSL2 + else if (proto_version == PY_SSL_VERSION_SSL2) + self->ctx = SSL_CTX_new(SSLv2_method()); /* Set up context */ |