diff options
Diffstat (limited to 'extra/python2/PKGBUILD')
-rw-r--r-- | extra/python2/PKGBUILD | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD index 39ce339d2..59a36acbb 100644 --- a/extra/python2/PKGBUILD +++ b/extra/python2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 206008 2014-02-15 15:11:11Z fyan $ +# $Id: PKGBUILD 206425 2014-02-26 04:18:20Z fyan $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributer: Allan McRae <allan@archlinux.org> # Contributer: Jason Chu <jason@archlinux.org> pkgname=python2 pkgver=2.7.6 -pkgrel=2 +pkgrel=3 _pybasever=2.7 pkgdesc="A high-level scripting language" arch=('i686' 'x86_64') @@ -16,12 +16,19 @@ makedepends=('tk>=8.6.0' 'bluez-libs') optdepends=('tk: for IDLE') conflicts=('python<3') options=('!makeflags') -source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz) -sha1sums=('8321636af2acbeaa68fc635d7dda7369ed446a80') +source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz + CVE-2014-1912.patch::http://hg.python.org/cpython/raw-rev/87673659d8f7) +sha1sums=('8321636af2acbeaa68fc635d7dda7369ed446a80' + '1d0527f7b8483e1e0e12867675fdff86f22cd297') prepare() { cd "${srcdir}/Python-${pkgver}" + # FS#39040 / CVE-2014-1912, upstream report: http://bugs.python.org/issue20246 + # Remove the NEWS file update from upstream patch which will cause a conflict + sed -i "40,51d" "$srcdir/CVE-2014-1912.patch" + patch -p1 -i "$srcdir/CVE-2014-1912.patch" + # Temporary workaround for FS#22322 # See http://bugs.python.org/issue10835 for upstream report sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c |