From ec549f64c923643d4b13dd7d364e080840ae3e29 Mon Sep 17 00:00:00 2001
From: root <root@rshg047.dnsready.net>
Date: Sat, 16 Apr 2011 13:48:38 +0000
Subject: Sat Apr 16 13:48:38 UTC 2011

---
 extra/python2/PKGBUILD | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'extra/python2/PKGBUILD')

diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD
index 2dadb1ec3..af34f960a 100644
--- a/extra/python2/PKGBUILD
+++ b/extra/python2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 119684 2011-04-13 16:35:24Z stephane $
+# $Id: PKGBUILD 119810 2011-04-15 12:17:53Z stephane $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributer: Jason Chu <jason@archlinux.org>
 
 pkgname=python2
 pkgver=2.7.1
-pkgrel=8
+pkgrel=9
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64')
@@ -17,16 +17,22 @@ optdepends=('tk: for IDLE')
 conflicts=('python<3')
 options=('!makeflags')
 source=(http://www.python.org/ftp/python/${pkgver}/Python-${pkgver}.tar.bz2
-        python-2.7-db51.diff
-        python-2.7.1-fix-decimal-in-turkish-locale.patch)
-md5sums=('aa27bc25725137ba155910bd8e5ddc4f'
-         'd9b8161568ce17a305c1b71e61ccd4b5'
-         '5032449f1ff2abfe18d14cc674165b23')
+        CVE-2011-1521.patch
+        python-2.7.1-fix-decimal-in-turkish-locale.patch
+        python-2.7-db51.patch)
+sha1sums=('fbe1894322ff91b80726e269c97454f4129fc2a3'
+         '31cdc76092d0f598289aaeb18e492874c981904d'
+         'baf470682ae7d2b55caaa173696d08d3f468a569' 
+         '9667a2a2f8594902b352793e649f78696a77bd13')
 
 build() {
   cd "${srcdir}/Python-${pkgver}"
 
-  patch -Np1 -i ../python-2.7-db51.diff
+  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
-- 
cgit v1.2.3-54-g00ecf