From: Florian Fainelli <florian@openwrt.org>
Date: Tue, 29 Dec 2009 22:35:12 +0000 (+0000)
Subject: [package] update python to 2.6.4 (#6407, fixes #6192)
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=e00bb595e6366709bfb176b954ef6d3cd8b644aa

[package] update python to 2.6.4 (#6407, fixes #6192)

SVN-Revision: 18969
---

diff --git a/lang/python/Makefile b/lang/python/Makefile
index 24a1b4ce7f..6110e904d0 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python
-PKG_VERSION:=2.6.1
+PKG_VERSION:=2.6.4
 PKG_RELEASE:=2
 
 PKG_SOURCE:=Python-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.python.org/ftp/python/$(PKG_VERSION)/
-PKG_MD5SUM:=e81c2f0953aa60f8062c05a4673f2be0
+PKG_MD5SUM:=fee5408634a54e721a93531aba37f8c1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/Python-$(PKG_VERSION)
 
diff --git a/lang/python/patches/080-distutils-dont_adjust_files.patch b/lang/python/patches/080-distutils-dont_adjust_files.patch
index 1698607062..1d086c18f5 100644
--- a/lang/python/patches/080-distutils-dont_adjust_files.patch
+++ b/lang/python/patches/080-distutils-dont_adjust_files.patch
@@ -1,8 +1,8 @@
-diff --git a/Lib/distutils/command/build_scripts.py b/Lib/distutils/command/build_scripts.py
-index c0d8f70..d36e29c 100644
+Index: build_scripts.py
+===================================================================
 --- a/Lib/distutils/command/build_scripts.py
 +++ b/Lib/distutils/command/build_scripts.py
-@@ -51,10 +51,7 @@ class build_scripts (Command):
+@@ -52,10 +52,7 @@
  
  
      def copy_scripts (self):
@@ -10,11 +10,11 @@ index c0d8f70..d36e29c 100644
 -        Python script in the Unix way (first line matches 'first_line_re',
 -        ie. starts with "\#!" and contains "python"), then adjust the first
 -        line to refer to the current Python interpreter as we copy.
-+        """Copy each script listed in 'self.scripts';
++        """Copy each script listed in 'self.scripts'
          """
          self.mkpath(self.build_dir)
          outfiles = []
-@@ -77,41 +74,9 @@ class build_scripts (Command):
+@@ -78,41 +75,9 @@
                  if not self.dry_run:
                      raise
                  f = None
@@ -42,8 +42,8 @@ index c0d8f70..d36e29c 100644
 -                        outf.write("#!%s%s\n" %
 -                                   (os.path.join(
 -                            sysconfig.get_config_var("BINDIR"),
--                            "python" + sysconfig.get_config_var("VERSION")
--                                     + sysconfig.get_config_var("EXE")),
+-                           "python%s%s" % (sysconfig.get_config_var("VERSION"),
+-                                           sysconfig.get_config_var("EXE"))),
 -                                    post_interp))
 -                    outf.writelines(f.readlines())
 -                    outf.close()
diff --git a/lang/python/patches/090-fix-ctypes.patch b/lang/python/patches/090-fix-ctypes.patch
new file mode 100644
index 0000000000..67a8a3eecd
--- /dev/null
+++ b/lang/python/patches/090-fix-ctypes.patch
@@ -0,0 +1,14 @@
+Index: Lib/ctypes/__init__.py
+===================================================================
+--- a/Lib/ctypes/__init__.py	(revision 77004)
++++ b/Lib/ctypes/__init__.py	(working copy)
+@@ -538,9 +538,3 @@
+     elif sizeof(kind) == 4: c_uint32 = kind
+     elif sizeof(kind) == 8: c_uint64 = kind
+ del(kind)
+-
+-# XXX for whatever reasons, creating the first instance of a callback
+-# function is needed for the unittests on Win64 to succeed.  This MAY
+-# be a compiler bug, since the problem occurs only when _ctypes is
+-# compiled with the MS SDK compiler.  Or an uninitialized variable?
+-CFUNCTYPE(c_int)(lambda: None)