diff options
| author | root <root@rshg047.dnsready.net> | 2011-06-16 22:59:30 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-06-16 22:59:30 +0000 |
| commit | 1fcb176285908c33aca3b0f5cb703ec098e5440c (patch) | |
| tree | 45be5519988f1ec96c9bc1a55e2ffcf5f5c62d26 /extra/python2/PKGBUILD | |
| parent | ebe74a263db3899367e12d936f908cdfdee7ec15 (diff) | |
Thu Jun 16 22:59:30 UTC 2011
Diffstat (limited to 'extra/python2/PKGBUILD')
| -rw-r--r-- | extra/python2/PKGBUILD | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD index af34f960a..f1c56f85d 100644 --- a/extra/python2/PKGBUILD +++ b/extra/python2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 119810 2011-04-15 12:17:53Z stephane $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributer: Stéphane Gaudreault <stephane@archlinux.org> +# $Id: PKGBUILD 127261 2011-06-12 03:23:25Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributer: Allan McRae <allan@archlinux.org> # Contributer: Jason Chu <jason@archlinux.org> pkgname=python2 -pkgver=2.7.1 -pkgrel=9 +pkgver=2.7.2 +pkgrel=1 _pybasever=2.7 pkgdesc="A high-level scripting language" arch=('i686' 'x86_64') @@ -16,13 +16,9 @@ makedepends=('tk') optdepends=('tk: for IDLE') conflicts=('python<3') options=('!makeflags') -source=(http://www.python.org/ftp/python/${pkgver}/Python-${pkgver}.tar.bz2 - CVE-2011-1521.patch - python-2.7.1-fix-decimal-in-turkish-locale.patch +source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz python-2.7-db51.patch) -sha1sums=('fbe1894322ff91b80726e269c97454f4129fc2a3' - '31cdc76092d0f598289aaeb18e492874c981904d' - 'baf470682ae7d2b55caaa173696d08d3f468a569' +sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53' '9667a2a2f8594902b352793e649f78696a77bd13') build() { @@ -30,14 +26,6 @@ build() { patch -Np1 -i ../python-2.7-db51.patch - # Fix urllib Security Vulnerability - # http://blog.python.org/2011/04/urllib-security-vulnerability-fixed.html - patch -Np1 -i ../CVE-2011-1521.patch - - # Fix "import decimal" in the Turkish locale - # cf : https://bugzilla.redhat.com/show_bug.cgi?id=694928 - patch -Np1 -i ../python-2.7.1-fix-decimal-in-turkish-locale.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 @@ -45,6 +33,9 @@ build() { # Enable built-in SQLite3 module to load extensions (fix FS#22122) sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py + # FS#2399 + sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py + # Ensure that we are using the system copy of various libraries (expat, zlib and libffi), # rather than copies shipped in the tarball rm -r Modules/expat |