Merge remote-tracking branch 'florin/python'

lunar-linux · Sep 7, 2013 · 6a7b2d1 · 6a7b2d1
2 parents 17741a1 + 4e59b74
commit 6a7b2d1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/python/Python-3/BUILD b/python/Python-3/BUILD
@@ -1,5 +1,8 @@
 (
 
+  patch_it $SOURCE2 1  &&
+  patch_it $SOURCE3 1  &&
+
   OPTS+=" --enable-shared --with-threads"  &&
 
   default_config &&

diff --git a/python/Python-3/DETAILS b/python/Python-3/DETAILS
@@ -1,12 +1,18 @@
           MODULE=Python-3
-         VERSION=3.0
+         VERSION=3.2
           SOURCE=$MODULE.$VERSION.tar.bz2
+         SOURCE2=$MODULE.$VERSION-CVE-2013-2099.patch.bz2
+         SOURCE3=$MODULE.$VERSION-CVE-2013-4238.patch.bz2
       SOURCE_URL=http://www.python.org/ftp/python/${MODULE#*-}.$VERSION/
+     SOURCE2_URL=$PATCH_URL
+     SOURCE3_URL=$PATCH_URL
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE.$VERSION
-      SOURCE_VFY=sha1:3e1464bc2c1dfa74287bc58da81168f50b0ae5c7
+      SOURCE_VFY=sha1:b28c36a9752b690059dc6df4fb9b4ec9d6c5708a
+     SOURCE2_VFY=sha1:b4c3c5cec70b30426d37cf84a4d2d8edf5ee0ffb
+     SOURCE3_VFY=sha1:d078dd135d486c7a2ef723b7ba01012ce02aa8c9
         WEB_SITE=http://www.python.org
          ENTERED=20121013
-         UPDATED=20121013
+         UPDATED=20130907
            SHORT="Interpreted, interactive, object-oriented programming language"
 
 cat << EOF