[packages_10.03.2] python: merge r29276, r29277, r29369

SVN-Revision: 30037

diff --git a/lang/python/Makefile b/lang/python/Makefile
index dd8d883f0d58a13fe6dd72e1a3d2c114109976e5..68d6b6f04866e578256aff9f2e5688b90012a511 100644 (file)
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python
 PKG_VERSION:=2.6.4
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=Python-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.python.org/ftp/python/$(PKG_VERSION)/
@@ -75,6 +75,12 @@ $(call Package/python/Default)
   DEPENDS+=+python-mini
 endef
 
+define Package/python-bzip2
+$(call Package/python/Default)
+  TITLE:=Python support for Bzip2
+  DEPENDS+=+python-mini +libbz2
+endef
+
 define Package/python-expat
 $(call Package/python/Default)
   TITLE:=Python support for expat
@@ -195,6 +201,7 @@ define PyPackage/python/filespec
 -|/usr/lib/python$(PYTHON_VERSION)/test
 -|/usr/lib/python$(PYTHON_VERSION)/lib2to3
 -|/usr/lib/python$(PYTHON_VERSION)/lib-old
+-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/bz2.so
 -|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/gdbm.so
 -|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_sqlite3.so
 -|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_ssl.so
@@ -239,7 +246,6 @@ define PyPackage/python/filespec
 -|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/syslog.so
 -|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/time.so
 -|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/unicodedata.so
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/zlib.so
 -|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_weakref.so
 -|/usr/lib/python$(PYTHON_VERSION)/linecache.py
 -|/usr/lib/python$(PYTHON_VERSION)/md5.py
@@ -318,7 +324,6 @@ define PyPackage/python-mini/filespec
 +|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/syslog.so
 +|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/time.so
 +|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/unicodedata.so
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/zlib.so
 +|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_weakref.so
 +|/usr/lib/python$(PYTHON_VERSION)/linecache.py
 +|/usr/lib/python$(PYTHON_VERSION)/md5.py
@@ -369,6 +374,10 @@ define PyPackage/python-doc/filespec
 +|/usr/lib/python$(PYTHON_VERSION)/pydoc.py
 endef
 
+define PyPackage/python-bzip2/filespec
++|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/bz2.so
+endef
+
 define PyPackage/python-expat/filespec
 +|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/pyexpat.so
 endef
@@ -427,6 +436,7 @@ $(eval $(call HostBuild))
 $(eval $(call PyPackage,python))
 $(eval $(call PyPackage,python-mini))
 $(eval $(call PyPackage,python-doc))
+$(eval $(call PyPackage,python-bzip2))
 $(eval $(call PyPackage,python-expat))
 $(eval $(call PyPackage,python-gzip))
 $(eval $(call PyPackage,python-openssl))
@@ -437,6 +447,7 @@ $(eval $(call PyPackage,python-gdbm))
 $(eval $(call BuildPackage,python))
 $(eval $(call BuildPackage,python-mini))
 $(eval $(call BuildPackage,python-doc))
+$(eval $(call BuildPackage,python-bzip2))
 $(eval $(call BuildPackage,python-expat))
 $(eval $(call BuildPackage,python-gzip))
 $(eval $(call BuildPackage,python-openssl))

diff --git a/lang/python/patches/000-cross-compile.patch b/lang/python/patches/000-cross-compile.patch
index dc2e1669777c426fd747a7ca8fa6c801b96f6db8..efbe07023c2634030ddd289fef2262c776896de3 100644 (file)
--- a/lang/python/patches/000-cross-compile.patch
+++ b/lang/python/patches/000-cross-compile.patch
@@ -2,8 +2,8 @@
  Makefile.pre.in |   25 +++++++++++++------------
  1 file changed, 13 insertions(+), 12 deletions(-)
 
---- Python-2.6.4.orig/Makefile.pre.in
-+++ Python-2.6.4/Makefile.pre.in
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
 @@ -175,6 +175,7 @@ UNICODE_OBJS=   @UNICODE_OBJS@
  
  PYTHON=               python$(EXE)

diff --git a/lang/python/patches/010-cannot-run-test-programm.patch b/lang/python/patches/010-cannot-run-test-programm.patch
index 471f0089482c551028086c410a4b8aded585e2a6..c981b462fc89ba62343641d1fc52ad3b43ab84a8 100644 (file)
--- a/lang/python/patches/010-cannot-run-test-programm.patch
+++ b/lang/python/patches/010-cannot-run-test-programm.patch
@@ -2,8 +2,8 @@
  configure.in |   46 ++++++++++++++++++++++++++++++++++------------
  1 file changed, 34 insertions(+), 12 deletions(-)
 
---- Python-2.6.4.orig/configure.in
-+++ Python-2.6.4/configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -2653,6 +2653,7 @@ AC_CHECK_LIB(c, inet_aton, [$ac_cv_prog_
  # On Tru64, chflags seems to be present, but calling it will
  # exit Python

diff --git a/lang/python/patches/011-linux-3.x-compat.patch b/lang/python/patches/011-linux-3.x-compat.patch
new file mode 100644 (file)
index 0000000..088618d
--- /dev/null
+++ b/lang/python/patches/011-linux-3.x-compat.patch
@@ -0,0 +1,20 @@
+--- a/configure
++++ b/configure
+@@ -2070,6 +2070,7 @@ then
+       MACHDEP="$ac_md_system$ac_md_release"
+ 
+       case $MACHDEP in
++      linux3) MACHDEP="linux2";;
+       cygwin*) MACHDEP="cygwin";;
+       darwin*) MACHDEP="darwin";;
+       atheos*) MACHDEP="atheos";;
+--- a/configure.in
++++ b/configure.in
+@@ -240,6 +240,7 @@ then
+       MACHDEP="$ac_md_system$ac_md_release"
+ 
+       case $MACHDEP in
++      linux3) MACHDEP="linux2";;
+       cygwin*) MACHDEP="cygwin";;
+       darwin*) MACHDEP="darwin";;
+       atheos*) MACHDEP="atheos";;

diff --git a/lang/python/patches/020-dont-compile-python-files.patch b/lang/python/patches/020-dont-compile-python-files.patch
index b3dd89d5e2314bbf394567a292d586dd9c3f7c7a..d9c092b52d30f7be96f18a9cdf9b4e6117a48ec7 100644 (file)
--- a/lang/python/patches/020-dont-compile-python-files.patch
+++ b/lang/python/patches/020-dont-compile-python-files.patch
@@ -2,8 +2,8 @@
  Makefile.pre.in |   16 ----------------
  1 file changed, 16 deletions(-)
 
---- Python-2.6.4.orig/Makefile.pre.in
-+++ Python-2.6.4/Makefile.pre.in
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
 @@ -887,22 +887,6 @@ libinstall:       build_all $(srcdir)/Lib/$(PL
                done; \
        done

diff --git a/lang/python/patches/030-fixup-include-dirs.patch b/lang/python/patches/030-fixup-include-dirs.patch
index ad009562e516bf84e8b8ece0c6ccc2bea04269dd..409b3e69a7739996284734094942984f04e200a6 100644 (file)
--- a/lang/python/patches/030-fixup-include-dirs.patch
+++ b/lang/python/patches/030-fixup-include-dirs.patch
@@ -2,8 +2,8 @@
  setup.py |   15 ++-------------
  1 file changed, 2 insertions(+), 13 deletions(-)
 
---- Python-2.6.4.orig/setup.py
-+++ Python-2.6.4/setup.py
+--- a/setup.py
++++ b/setup.py
 @@ -309,9 +309,6 @@ class PyBuildExt(build_ext):
          return sys.platform
  

diff --git a/lang/python/patches/040-dont-import-cross-compiled-modules.patch b/lang/python/patches/040-dont-import-cross-compiled-modules.patch
index 85e1e7e8aa0b496c7eb05ecb892be424506743ef..5c99598e96570379df6f024cc8560fefd74fb6e4 100644 (file)
--- a/lang/python/patches/040-dont-import-cross-compiled-modules.patch
+++ b/lang/python/patches/040-dont-import-cross-compiled-modules.patch
@@ -2,8 +2,8 @@
  setup.py |   30 ------------------------------
  1 file changed, 30 deletions(-)
 
---- Python-2.6.4.orig/setup.py
-+++ Python-2.6.4/setup.py
+--- a/setup.py
++++ b/setup.py
 @@ -270,36 +270,6 @@ class PyBuildExt(build_ext):
          ext_filename = os.path.join(
              self.build_lib,

diff --git a/lang/python/patches/070-dont-clean-ipkg-install.patch b/lang/python/patches/070-dont-clean-ipkg-install.patch
index 0eee56bb9b20aff019e2ab2f2b876710177c35a7..593bcff83cc0f100b0863377b21e8a5a7f7c147b 100644 (file)
--- a/lang/python/patches/070-dont-clean-ipkg-install.patch
+++ b/lang/python/patches/070-dont-clean-ipkg-install.patch
@@ -2,8 +2,8 @@
  Makefile.pre.in |    6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
---- Python-2.6.4.orig/Makefile.pre.in
-+++ Python-2.6.4/Makefile.pre.in
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
 @@ -1118,11 +1118,11 @@ TAGS::
  # Sanitation targets -- clean leaves libraries, executables and tags
  # files, which clobber removes as well

diff --git a/lang/python/patches/080-distutils-dont_adjust_files.patch b/lang/python/patches/080-distutils-dont_adjust_files.patch
index c4798e50bf65897390a123c61462466b0d4a16a6..a32e034a756a1acfb6477acc4132b837228551ed 100644 (file)
--- a/lang/python/patches/080-distutils-dont_adjust_files.patch
+++ b/lang/python/patches/080-distutils-dont_adjust_files.patch
@@ -2,8 +2,8 @@
  Lib/distutils/command/build_scripts.py |   43 +++------------------------------
  1 file changed, 4 insertions(+), 39 deletions(-)
 
---- Python-2.6.4.orig/Lib/distutils/command/build_scripts.py
-+++ Python-2.6.4/Lib/distutils/command/build_scripts.py
+--- a/Lib/distutils/command/build_scripts.py
++++ b/Lib/distutils/command/build_scripts.py
 @@ -54,10 +54,7 @@ class build_scripts (Command):
  
  

diff --git a/lang/python/patches/090-fix-ctypes.patch b/lang/python/patches/090-fix-ctypes.patch
index 616e76d46b15cef45e33b5e5dd8d2878044d7117..6e931826644843429916a03f912daff5d2a4b002 100644 (file)
--- a/lang/python/patches/090-fix-ctypes.patch
+++ b/lang/python/patches/090-fix-ctypes.patch
@@ -2,9 +2,9 @@
  Lib/ctypes/__init__.py |    6 ------
  1 file changed, 6 deletions(-)
 
---- Python-2.6.4.orig/Lib/ctypes/__init__.py
-+++ Python-2.6.4/Lib/ctypes/__init__.py
-@@ -538,9 +538,3 @@ for kind in [c_ushort, c_uint, c_ulong,
+--- a/Lib/ctypes/__init__.py
++++ b/Lib/ctypes/__init__.py
+@@ -538,9 +538,3 @@ for kind in [c_ushort, c_uint, c_ulong, 
      elif sizeof(kind) == 4: c_uint32 = kind
      elif sizeof(kind) == 8: c_uint64 = kind
  del(kind)

diff --git a/lang/python/patches/110-enable-zlib.patch b/lang/python/patches/110-enable-zlib.patch
index ac2e05147f63d50c89a13b014b3de761d9e298ad..cdc70733c75485716b51ba2c163db242b4e7d0ba 100644 (file)
--- a/lang/python/patches/110-enable-zlib.patch
+++ b/lang/python/patches/110-enable-zlib.patch
@@ -2,8 +2,8 @@
  Modules/Setup.dist |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- Python-2.6.4.orig/Modules/Setup.dist
-+++ Python-2.6.4/Modules/Setup.dist
+--- a/Modules/Setup.dist
++++ b/Modules/Setup.dist
 @@ -460,7 +460,7 @@ GLHACK=-Dclear=__GLclear
  # Andrew Kuchling's zlib module.
  # This require zlib 1.1.3 (or later).

diff --git a/lang/python/patches/120-force-internal-modules-for-hashlib.patch b/lang/python/patches/120-force-internal-modules-for-hashlib.patch
index f0bdeef0c9b57db790a090d85894159ea0ec8432..ca29aa651ab2931e729adc2243974c077aa83991 100644 (file)
--- a/lang/python/patches/120-force-internal-modules-for-hashlib.patch
+++ b/lang/python/patches/120-force-internal-modules-for-hashlib.patch
@@ -2,8 +2,8 @@
  setup.py |   10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)
 
---- Python-2.6.4.orig/setup.py
-+++ Python-2.6.4/setup.py
+--- a/setup.py
++++ b/setup.py
 @@ -622,9 +622,10 @@ class PyBuildExt(build_ext):
  
          #print 'openssl_ver = 0x%08x' % openssl_ver