Sat Sep 7 02:08:44 PDT 2013

1 files changed, 15 insertions, 6 deletions

diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD
index f76242d3b..3d66fb8fe 100644
--- a/extra/python2/PKGBUILD
+++ b/extra/python2/PKGBUILD
@@ -1,27 +1,32 @@
-# $Id: PKGBUILD 185697 2013-05-17 11:13:51Z stephane $
+# $Id: PKGBUILD 193929 2013-09-06 08:06:17Z bpiotrowski $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributer: Allan McRae <allan@archlinux.org>
 # Contributer: Jason Chu <jason@archlinux.org>
 
 pkgname=python2
 pkgver=2.7.5
-pkgrel=1
+pkgrel=2
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64')
 license=('PSF')
 url="http://www.python.org/"
 depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
-makedepends=('tk>=8.6.0' 'bluez')
+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=('b7389791f789625c2ba9d897aa324008ff482daf')
+source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
+        python-2.7.5-CVE-2013-4238.patch)
+sha1sums=('b7389791f789625c2ba9d897aa324008ff482daf'
+          'fb1f95ca21d9c00eaaea5a58236d1d97300482d7')
 
-build() {
+prepare() {
   cd "${srcdir}/Python-${pkgver}"
 
+  # http://bugs.python.org/issue18709
+  patch -Np1 -i ../python-2.7.5-CVE-2013-4238.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
@@ -40,6 +45,10 @@ build() {
   rm -r Modules/expat
   rm -r Modules/zlib
   rm -r Modules/_ctypes/{darwin,libffi}*
+}
+
+build() {
+  cd "${srcdir}/Python-${pkgver}"
 
   export OPT="${CFLAGS}"
   ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \