From 9873a6bedfd3b6e8e6676cfde9cf944e459e41dd Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 6 May 2012 18:07:34 +0200 Subject: [PATCH] python: security update to 2.7.3. fixes #10085 --- ...thon-force-sys-platform-to-be-linux2.patch | 23 ------------------- ...1-lib64.patch => python-2.7.3-lib64.patch} | 12 ++++++---- python/python.nm | 6 ++--- 3 files changed, 10 insertions(+), 31 deletions(-) delete mode 100644 python/patches/python-force-sys-platform-to-be-linux2.patch rename python/{python-2.7.1-lib64.patch => python-2.7.3-lib64.patch} (97%) diff --git a/python/patches/python-force-sys-platform-to-be-linux2.patch b/python/patches/python-force-sys-platform-to-be-linux2.patch deleted file mode 100644 index efa3bcdea..000000000 --- a/python/patches/python-force-sys-platform-to-be-linux2.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up Python-2.7.2/configure.in.linux2 Python-2.7.2/configure.in ---- Python-2.7.2/configure.in.linux2 2011-09-13 23:18:19.237252000 -0400 -+++ Python-2.7.2/configure.in 2011-09-13 23:18:19.494252001 -0400 -@@ -293,6 +293,7 @@ then - MACHDEP="$ac_md_system$ac_md_release" - - case $MACHDEP in -+ linux*) MACHDEP="linux2";; - cygwin*) MACHDEP="cygwin";; - darwin*) MACHDEP="darwin";; - atheos*) MACHDEP="atheos";; -diff -up Python-2.7.2/configure.linux2 Python-2.7.2/configure ---- Python-2.7.2/configure.linux2 2011-06-11 11:46:28.000000000 -0400 -+++ Python-2.7.2/configure 2011-09-13 23:18:19.489252001 -0400 -@@ -3003,6 +3003,7 @@ then - MACHDEP="$ac_md_system$ac_md_release" - - case $MACHDEP in -+ linux*) MACHDEP="linux2";; - cygwin*) MACHDEP="cygwin";; - darwin*) MACHDEP="darwin";; - atheos*) MACHDEP="atheos";; -diff -up Python-2.7.2/Misc/NEWS.linux2 Python-2.7.2/Misc/NEWS diff --git a/python/python-2.7.1-lib64.patch b/python/python-2.7.3-lib64.patch similarity index 97% rename from python/python-2.7.1-lib64.patch rename to python/python-2.7.3-lib64.patch index 4b07470dd..b3d5d9135 100644 --- a/python/python-2.7.1-lib64.patch +++ b/python/python-2.7.3-lib64.patch @@ -58,10 +58,10 @@ diff -up Python-2.7.1/Lib/site.py.lib64 Python-2.7.1/Lib/site.py diff -up Python-2.7.1/Lib/test/test_site.py.lib64 Python-2.7.1/Lib/test/test_site.py --- Python-2.7.1/Lib/test/test_site.py.lib64 2010-11-21 08:34:58.000000000 -0500 +++ Python-2.7.1/Lib/test/test_site.py 2010-12-23 15:55:19.782935931 -0500 -@@ -169,17 +169,20 @@ class HelperFunctionsTests(unittest.Test - wanted = os.path.join('xoxo', 'Lib', 'site-packages') - self.assertEqual(dirs[0], wanted) +@@ -241,18 +241,22 @@ + self.assertEqual(dirs[2], wanted) elif os.sep == '/': + # OS X non-framwework builds, Linux, FreeBSD, etc - self.assertEqual(len(dirs), 2) + self.assertEquals(len(dirs), 3) + wanted = os.path.join('xoxo', 'lib64', 'python' + sys.version[:3], @@ -75,6 +75,7 @@ diff -up Python-2.7.1/Lib/test/test_site.py.lib64 Python-2.7.1/Lib/test/test_sit - self.assertEqual(dirs[1], wanted) + self.assertEquals(dirs[2], wanted) else: + # other platforms - self.assertEqual(len(dirs), 2) - self.assertEqual(dirs[0], 'xoxo') - wanted = os.path.join('xoxo', 'lib', 'site-packages') @@ -83,9 +84,10 @@ diff -up Python-2.7.1/Lib/test/test_site.py.lib64 Python-2.7.1/Lib/test/test_sit + self.assertEquals(dirs[0], 'xoxo') + wanted = os.path.join('xoxo', 'lib64', 'site-packages') + self.assertEquals(dirs[1], wanted) ++ - # let's try the specific Apple location - if (sys.platform == "darwin" and + class PthFile(object): + """Helper class for handling testing of .pth files""" diff -up Python-2.7.1/Makefile.pre.in.lib64 Python-2.7.1/Makefile.pre.in --- Python-2.7.1/Makefile.pre.in.lib64 2010-12-23 15:51:19.407063264 -0500 +++ Python-2.7.1/Makefile.pre.in 2010-12-23 15:51:19.426063917 -0500 diff --git a/python/python.nm b/python/python.nm index c4c0c7d79..d5c1a2d7b 100644 --- a/python/python.nm +++ b/python/python.nm @@ -5,8 +5,8 @@ name = python major_ver = 2.7 -version = %{major_ver}.2 -release = 7 +version = %{major_ver}.3 +release = 1 thisapp = Python-%{version} groups = Development/Languages @@ -48,7 +48,7 @@ build prepare_cmds # Apply patches for x86_64. if [ "$(uname -m)" = "x86_64" ]; then - patch -Np1 -i %{DIR_SOURCE}/python-2.7.1-lib64.patch + patch -Np1 -i %{DIR_SOURCE}/python-2.7.3-lib64.patch patch -Np1 -i %{DIR_SOURCE}/python-2.7-lib64-sysconfig.patch fi -- 2.47.2