update to latest stable upstream

5 files changed, 25 insertions, 52 deletions

diff --git a/package/python2/Makefile b/package/python2/Makefile
index ece0ad685..5eab1d7b5 100644
--- a/package/python2/Makefile
+++ b/package/python2/Makefile
@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		python2
-PKG_VERSION:=		2.7.5
-PKG_RELEASE:=		13
-PKG_HASH:=		8e1b5fa87b91835afb376a9c0d319d41feca07ffebc0288d97ab08d64f48afbf
+PKG_VERSION:=		2.7.9
+PKG_RELEASE:=		1
+PKG_HASH:=		c8bba33e66ac3201dabdc556f0ea7cfe6ac11946ec32d357c4c6f9b018c12c5b
 PKG_DESCR:=		python scripting language (Version 2)
 PKG_SECTION:=		dev/lang
 PKG_BUILDDEP:=		libffi python2-host 
@@ -16,8 +16,6 @@ PKG_URL:=		http://www.python.org/
 PKG_SITES:=		http://www.python.org/ftp/python/${PKG_VERSION}/
 PKG_OPTS:=		dev
 
-PKG_HOST_DEPENDS:=	!netbsd !openbsd
-
 DISTFILES:=		Python-${PKG_VERSION}.tgz
 WRKDIST=		${WRKDIR}/Python-${PKG_VERSION}
 
@@ -100,6 +98,7 @@ CONFIGURE_ARGS:=	--with-threads \
 
 HOST_CONFIGURE_ENV+=	MACOSX_DEPLOYMENT_TARGET=10.9
 HOST_CONFIGURE_ARGS+=	--with-threads \
+			--with-system-ffi \
 			--enable-shared \
 			--disable-ipv6 \
 			--disable-toolbox-glue \
diff --git a/package/python2/patches/patch-Makefile_pre_in b/package/python2/patches/patch-Makefile_pre_in
index 26077c7fc..b68b57028 100644
--- a/package/python2/patches/patch-Makefile_pre_in
+++ b/package/python2/patches/patch-Makefile_pre_in
@@ -1,6 +1,6 @@
---- Python-2.7.5.orig/Makefile.pre.in	2013-05-12 05:32:49.000000000 +0200
-+++ Python-2.7.5/Makefile.pre.in	2013-11-01 14:54:24.000000000 +0100
-@@ -227,6 +227,7 @@ LIBFFI_INCLUDEDIR=	@LIBFFI_INCLUDEDIR@
+--- Python-2.7.9.orig/Makefile.pre.in	2014-12-10 16:59:50.000000000 +0100
++++ Python-2.7.9/Makefile.pre.in	2015-04-11 14:06:58.373384200 +0200
+@@ -234,6 +234,7 @@ LIBFFI_INCLUDEDIR=	@LIBFFI_INCLUDEDIR@
  ##########################################################################
  # Parser
  PGEN=		Parser/pgen$(EXE)
@@ -8,16 +8,16 @@
  
  PSRCS=		\
  		Parser/acceler.c \
-@@ -456,7 +457,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.tx
- 	    *) quiet="";; \
+@@ -474,7 +475,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.tx
  	esac; \
  	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
+ 		_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
 -		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
 +		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py build
  
  # Build static library
  # avoid long command lines, same as LIBRARY_OBJS
-@@ -593,7 +594,7 @@ Modules/pwdmodule.o: $(srcdir)/Modules/p
+@@ -611,7 +612,7 @@ Modules/pwdmodule.o: $(srcdir)/Modules/p
  $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS)
  		@$(MKDIR_P) Include
  		$(MAKE) $(PGEN)
@@ -26,7 +26,7 @@
  $(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS)
  		$(MAKE) $(GRAMMAR_H)
  		touch $(GRAMMAR_C)
-@@ -1000,28 +1001,6 @@ libinstall:	build_all $(srcdir)/Lib/$(PL
+@@ -1042,28 +1043,6 @@ libinstall:	build_all $(srcdir)/Lib/$(PL
  		$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
  			$(DESTDIR)$(LIBDEST)/distutils/tests ; \
  	fi
diff --git a/package/python2/patches/patch-Modules_posixmodule_c b/package/python2/patches/patch-Modules_posixmodule_c
deleted file mode 100644
index 5374fb975..000000000
--- a/package/python2/patches/patch-Modules_posixmodule_c
+++ /dev/null
@@ -1,20 +0,0 @@
---- Python-2.7.5.orig/Modules/posixmodule.c	2013-05-12 05:32:51.000000000 +0200
-+++ Python-2.7.5/Modules/posixmodule.c	2014-01-06 10:49:56.103893388 +0100
-@@ -6552,7 +6552,7 @@ PyDoc_STRVAR(posix_close__doc__,
- Close a file descriptor (for low level IO).");
- 
- static PyObject *
--posix_close(PyObject *self, PyObject *args)
-+posix_pyclose(PyObject *self, PyObject *args)
- {
-     int fd, res;
-     if (!PyArg_ParseTuple(args, "i:close", &fd))
-@@ -8930,7 +8930,7 @@ static PyMethodDef posix_methods[] = {
-     {"tcsetpgrp",       posix_tcsetpgrp, METH_VARARGS, posix_tcsetpgrp__doc__},
- #endif /* HAVE_TCSETPGRP */
-     {"open",            posix_open, METH_VARARGS, posix_open__doc__},
--    {"close",           posix_close, METH_VARARGS, posix_close__doc__},
-+    {"close",           posix_pyclose, METH_VARARGS, posix_close__doc__},
-     {"closerange",      posix_closerange, METH_VARARGS, posix_closerange__doc__},
-     {"dup",             posix_dup, METH_VARARGS, posix_dup__doc__},
-     {"dup2",            posix_dup2, METH_VARARGS, posix_dup2__doc__},
diff --git a/package/python2/patches/patch-configure_ac b/package/python2/patches/patch-configure_ac
index 0ec10f1de..ae2c7ada1 100644
--- a/package/python2/patches/patch-configure_ac
+++ b/package/python2/patches/patch-configure_ac
@@ -1,6 +1,6 @@
---- Python-2.7.5.orig/configure.ac	2013-05-12 05:32:54.000000000 +0200
-+++ Python-2.7.5/configure.ac	2013-10-30 15:33:30.000000000 +0100
-@@ -19,7 +19,7 @@ AC_SUBST(host)
+--- Python-2.7.9.orig/configure.ac	2014-12-10 17:00:00.000000000 +0100
++++ Python-2.7.9/configure.ac	2015-04-11 09:05:42.203804700 +0200
+@@ -22,7 +22,7 @@ rm -f pybuilddir.txt
  if test "$cross_compiling" = yes; then
      AC_MSG_CHECKING([for python interpreter for cross build])
      if test -z "$PYTHON_FOR_BUILD"; then
@@ -9,7 +9,7 @@
  	    which $interp >/dev/null 2>&1 || continue
  	    if $interp -c 'import sys;sys.exit(not (sys.version_info@<:@:2@:>@ >= (2,7) and sys.version_info@<:@0@:>@ < 3))'; then
  	        break
-@@ -1066,9 +1066,7 @@ then
+@@ -1070,9 +1070,7 @@ then
  	    if test "$Py_DEBUG" = 'true' ; then
  		# Optimization messes up debuggers, so turn it off for
  		# debug builds.
diff --git a/package/python2/patches/patch-setup_py b/package/python2/patches/patch-setup_py
index 4973a91b2..065bf642b 100644
--- a/package/python2/patches/patch-setup_py
+++ b/package/python2/patches/patch-setup_py
@@ -1,5 +1,5 @@
---- Python-2.7.5.orig/setup.py	2013-05-12 05:32:54.000000000 +0200
-+++ Python-2.7.5/setup.py	2014-02-03 17:07:52.000000000 +0100
+--- Python-2.7.9.orig/setup.py	2014-12-10 17:00:01.000000000 +0100
++++ Python-2.7.9/setup.py	2015-04-11 08:37:49.609444500 +0200
 @@ -74,7 +74,7 @@ def find_file(filename, std_dirs, paths)
      'paths' is a list of additional locations to check; if the file is
          found in one of them, the resulting list will contain the directory.
@@ -62,7 +62,7 @@
          # Detect which modules should be compiled
          missing = self.detect_modules()
  
-@@ -281,6 +282,7 @@ class PyBuildExt(build_ext):
+@@ -283,6 +284,7 @@ class PyBuildExt(build_ext):
  
      def build_extension(self, ext):
  
@@ -70,23 +70,17 @@
          if ext.name == '_ctypes':
              if not self.configure_ctypes(ext):
                  return
-@@ -437,10 +439,12 @@ class PyBuildExt(build_ext):
- 
-     def detect_modules(self):
-         # Ensure that /usr/local is always used
--        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
--        add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-+        if not cross_compiling:	
-+            add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-+            add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-         self.add_gcc_paths()
+@@ -444,7 +446,8 @@ class PyBuildExt(build_ext):
+             add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
+         if cross_compiling:
+             self.add_gcc_paths()
 -        self.add_multiarch_paths()
 +        if not cross_compiling:
 +            self.add_multiarch_paths()
  
          # Add paths specified in the environment variables LDFLAGS and
          # CPPFLAGS for header and library files.
-@@ -477,7 +481,8 @@ class PyBuildExt(build_ext):
+@@ -481,7 +484,8 @@ class PyBuildExt(build_ext):
                          add_dir_to_list(dir_list, directory)
  
          if os.path.normpath(sys.prefix) != '/usr' \
@@ -96,7 +90,7 @@
              # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
              # (PYTHONFRAMEWORK is set) to avoid # linking problems when
              # building a framework with different architectures than
-@@ -495,8 +500,13 @@ class PyBuildExt(build_ext):
+@@ -499,8 +503,13 @@ class PyBuildExt(build_ext):
          # lib_dirs and inc_dirs are used to search for files;
          # if a file is found in one of those directories, it can
          # be assumed that no additional -I,-L directives are needed.
@@ -110,7 +104,7 @@
          if not cross_compiling:
              for d in (
                  '/usr/include',
-@@ -530,7 +540,7 @@ class PyBuildExt(build_ext):
+@@ -534,7 +543,7 @@ class PyBuildExt(build_ext):
          if host_platform == 'hp-ux11':
              lib_dirs += ['/usr/lib/hpux64', '/usr/lib/hpux32']