Add python2 package

2013-11-05 10:59:13 +04:00
parent 4618c85574
commit aeb48e10a5
18 changed files with 2327 additions and 0 deletions
--- a/python2/2.7.5-FD_SETSIZE.patch
+++ b/python2/2.7.5-FD_SETSIZE.patch
@@ -0,0 +1,42 @@
+diff -urN a/Modules/selectmodule.c b/Modules/selectmodule.c
+--- a/Modules/selectmodule.c	2013-10-20 19:30:20.515023800 +0100
+++ b/Modules/selectmodule.c	2013-10-20 19:30:45.872474100 +0100
+@@ -6,6 +6,21 @@
+    >= 0.
+ */
+ 
+/* Windows #defines FD_SETSIZE to 64 if FD_SETSIZE isn't already defined.
+   64 is too small (too many people have bumped into that limit).
+   Here we boost it.
+
+   Cygwin also defines FD_SETSIZE to 64, so also increase the limit on
+   Cygwin.  We must do this before sys/types.h is included, which otherwise
+   sets FD_SETSIZE to the default.
+
+   Users who want even more than the boosted limit should #define
+   FD_SETSIZE higher before this; e.g., via compiler /D switch.
+*/
+#if (defined(MS_WINDOWS) || defined(__CYGWIN__)) && !defined(FD_SETSIZE)
+#define FD_SETSIZE 512
+#endif
+
+ #include "Python.h"
+ #include <structmember.h>
+ 
+@@ -16,16 +31,6 @@
+ #undef HAVE_BROKEN_POLL
+ #endif
+ 
+-/* Windows #defines FD_SETSIZE to 64 if FD_SETSIZE isn't already defined.
+-   64 is too small (too many people have bumped into that limit).
+-   Here we boost it.
+-   Users who want even more than the boosted limit should #define
+-   FD_SETSIZE higher before this; e.g., via compiler /D switch.
+-*/
+-#if defined(MS_WINDOWS) && !defined(FD_SETSIZE)
+-#define FD_SETSIZE 512
+-#endif
+-
+ #if defined(HAVE_POLL_H)
+ #include <poll.h>
+ #elif defined(HAVE_SYS_POLL_H)
--- a/python2/2.7.5-allow-windows-paths-for-executable.patch
+++ b/python2/2.7.5-allow-windows-paths-for-executable.patch
@@ -0,0 +1,129 @@
+diff -urN a/Modules/getpath.c b/Modules/getpath.c
+--- a/Modules/getpath.c	2013-10-21 11:14:32.295032500 +0100
+++ b/Modules/getpath.c	2013-10-21 12:23:00.165259900 +0100
+@@ -10,6 +10,10 @@
+ #include <mach-o/dyld.h>
+ #endif
+ 
+#if defined(MS_WINDOWS) || defined(__CYGWIN__)
+#include <windows.h>
+#endif
+
+ /* Search in some common locations for the associated Python libraries.
+  *
+  * Two directories must be found, the platform independent directory
+@@ -127,7 +131,11 @@
+ 
+ static char prefix[MAXPATHLEN+1];
+ static char exec_prefix[MAXPATHLEN+1];
+-static char progpath[MAXPATHLEN+1];
+static char progpath[MAXPATHLEN+1] = {'\0'};
+#if defined(MS_WINDOWS) || defined(__CYGWIN__)
+static char dllpath[MAXPATHLEN+1] = {'\0'};
+extern HANDLE PyWin_DLLhModule;
+#endif
+ static char *module_search_path = NULL;
+ static char lib_python[] = "lib/python" VERSION;
+ 
+@@ -208,7 +216,11 @@
+ joinpath(char *buffer, char *stuff)
+ {
+     size_t n, k;
+#if defined(MS_WINDOWS) || defined(__CYGWIN__)
+    if (stuff[0] == SEP || (strlen(stuff)>=2 && stuff[0] != 0 && stuff[1] == ':'))
+#else
+     if (stuff[0] == SEP)
+#endif
+         n = 0;
+     else {
+         n = strlen(buffer);
+@@ -222,6 +234,13 @@
+         k = MAXPATHLEN - n;
+     strncpy(buffer+n, stuff, k);
+     buffer[n+k] = '\0';
+#if defined(__CYGWIN__)
+    /* MSYS specific: Turn C:* into /c* */
+    if (strlen(buffer)>2 && buffer[0] != 0 && buffer[1] == ':') {
+        buffer[1]=buffer[0]|32;
+        buffer[0]='/';
+    }
+#endif
+ }
+ 
+ /* copy_absolute requires that path be allocated at least
+@@ -229,8 +248,21 @@
+ static void
+ copy_absolute(char *path, char *p)
+ {
+#if defined(MS_WINDOWS) || defined(__CYGWIN__)
+    if (p[0] == SEP || (strlen(p)>=2 && p[0] != 0 && p[1] == ':'))
+#else
+     if (p[0] == SEP)
+#endif
+    {
+         strcpy(path, p);
+#if defined(__CYGWIN__)
+        /* MSYS specific: Turn C:* into /c* */
+        if (strlen(path)>2 && path[0] != 0 && path[1] == ':') {
+            path[1]=path[0]|32;
+            path[0]='/';
+        }
+#endif
+    }
+     else {
+         if (!getcwd(path, MAXPATHLEN)) {
+             /* unable to get the current directory */
+@@ -382,6 +414,42 @@
+ }
+ 
+ 
+#if defined(MS_WINDOWS) || defined(__CYGWIN__)
+/* Calculates dllpath and progpath, replacing \\ with / */
+int GetWindowsModulePaths()
+{
+    int result = 0;
+    char* seps;
+    result = GetModuleFileNameA(NULL, progpath, MAXPATHLEN);
+    seps = strchr(progpath, '\\');
+    while(seps) {
+        *seps = '/';
+        seps = strchr(seps, '\\');
+    }
+    dllpath[0] = '\0';
+#if defined(Py_ENABLE_SHARED) && !defined(__CYGWIN__)
+    // Hmm, cygwin/MSYS2 replacement for PyWin_DLLhModule is needed.
+    if (PyWin_DLLhModule) {
+        if((GetModuleFileNameA(PyWin_DLLhModule, dllpath, MAXPATHLEN) > 0)) {
+            result = 1;
+            seps = strchr(dllpath, '\\');
+            while(seps) {
+                *seps = '/';
+                seps = strchr(seps, '\\');
+            }
+        }
+    }
+#endif
+
+    /* Just so that 'MSYS specific: Turn C:* into /c*'
+       is done. */
+    absolutize(progpath);
+    absolutize(dllpath);
+
+    return result;
+}
+#endif /* MS_WINDOWS */
+
+ static void
+ calculate_path(void)
+ {
+@@ -433,6 +501,10 @@
+      else if(0 == _NSGetExecutablePath(progpath, &nsexeclength) && progpath[0] == SEP)
+        ;
+ #endif /* __APPLE__ */
+#if defined(MS_WINDOWS) || defined(__CYGWIN__)
+     else if(GetWindowsModulePaths()) {
+     }
+#endif /* MS_WINDOWS */
+         else if (path) {
+                 while (1) {
+                         char *delim = strchr(path, DELIM);
--- a/python2/2.7.5-ctypes-util-find_library.patch
+++ b/python2/2.7.5-ctypes-util-find_library.patch
@@ -0,0 +1,35 @@
+diff -urN a/Lib/ctypes/util.py b/Lib/ctypes/util.py
+--- a/Lib/ctypes/util.py	2013-05-12 04:32:42.000000000 +0100
+++ b/Lib/ctypes/util.py	2013-10-20 19:27:59.754972700 +0100
+@@ -84,6 +84,20 @@
+                 continue
+         return None
+ 
+elif sys.platform == "cygwin":
+    def find_library(name):
+        for libdir in ['/usr/lib', '/usr/local/lib']:
+            for libext in ['lib%s.dll.a' % name, 'lib%s.a' % name]:
+                implib = os.path.join(libdir, libext)
+                if not os.path.exists(implib):
+                    continue
+                cmd = "dlltool -I " + implib + " 2>/dev/null"
+                res = os.popen(cmd).read().replace("\n","")
+                if not res:
+                    continue
+                return res
+        return None
+
+ elif os.name == "posix":
+     # Andreas Degert's find functions, using gcc, /sbin/ldconfig, objdump
+     import re, tempfile, errno
+@@ -267,6 +281,10 @@
+             print cdll.LoadLibrary("libcrypto.dylib")
+             print cdll.LoadLibrary("libSystem.dylib")
+             print cdll.LoadLibrary("System.framework/System")
+        elif sys.platform == "cygwin":
+            print cdll.LoadLibrary("cygbz2-1.dll") 
+            print find_library("crypt")
+            print cdll.LoadLibrary("cygcrypt-0.dll") 
+         else:
+             print cdll.LoadLibrary("libm.so")
+             print cdll.LoadLibrary("libcrypt.so")
--- a/python2/2.7.5-dbm.patch
+++ b/python2/2.7.5-dbm.patch
@@ -0,0 +1,28 @@
+diff -urN a/setup.py b/setup.py
+--- a/setup.py	2013-10-20 19:33:02.452286000 +0100
+++ b/setup.py	2013-10-20 19:33:25.714616600 +0100
+@@ -1230,7 +1230,7 @@
+ 
+         dbm_order = ['gdbm']
+         # The standard Unix dbm module:
+-        if host_platform not in ['cygwin']:
+        if host_platform not in ['win32']:
+             config_args = [arg.strip("'")
+                            for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
+             dbm_args = [arg for arg in config_args
+@@ -1285,6 +1285,15 @@
+                                     ],
+                                 libraries = gdbm_libs)
+                             break
+                        if find_file("ndbm.h", inc_dirs, []) is not None:
+                            print("building dbm using gdbm")
+                            dbmext = Extension(
+                                'dbm', ['dbmmodule.c'],
+                                define_macros=[
+                                    ('HAVE_NDBM_H', None),
+                                    ],
+                                libraries = gdbm_libs)
+                            break
+                 elif cand == "bdb":
+                     if db_incs is not None:
+                         print "building dbm using bdb"
--- a/python2/2.7.5-dylib.patch
+++ b/python2/2.7.5-dylib.patch
@@ -0,0 +1,11 @@
+diff -urN a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py
+--- a/Lib/distutils/unixccompiler.py	2013-10-20 19:33:46.896828100 +0100
+++ b/Lib/distutils/unixccompiler.py	2013-10-20 19:34:22.585869400 +0100
+@@ -82,6 +82,7 @@
+     static_lib_format = shared_lib_format = dylib_lib_format = "lib%s%s"
+     if sys.platform == "cygwin":
+         exe_extension = ".exe"
+        dylib_lib_extension = ".dll.a"
+ 
+     def preprocess(self, source,
+                    output_file=None, macros=None, include_dirs=None,
--- a/python2/2.7.5-export-PyNode_SizeOf.patch
+++ b/python2/2.7.5-export-PyNode_SizeOf.patch
@@ -0,0 +1,12 @@
+diff -urN a/Include/node.h b/Include/node.h
+--- a/Include/node.h	2013-10-20 19:36:23.352776900 +0100
+++ b/Include/node.h	2013-10-20 19:36:53.765516400 +0100
+@@ -21,7 +21,7 @@
+                                       char *str, int lineno, int col_offset);
+ PyAPI_FUNC(void) PyNode_Free(node *n);
+ #ifndef Py_LIMITED_API
+-Py_ssize_t _PyNode_SizeOf(node *n);
+PyAPI_FUNC(Py_ssize_t) _PyNode_SizeOf(node *n);
+ #endif
+ 
+ /* Node access functions */
--- a/python2/2.7.5-export-PySignal_SetWakeupFd.patch
+++ b/python2/2.7.5-export-PySignal_SetWakeupFd.patch
@@ -0,0 +1,12 @@
+diff -urN a/Include/pyerrors.h b/Include/pyerrors.h
+--- a/Include/pyerrors.h	2013-10-20 19:30:57.390132900 +0100
+++ b/Include/pyerrors.h	2013-10-20 19:31:33.580202800 +0100
+@@ -231,7 +231,7 @@
+ PyAPI_FUNC(void) PyErr_SetInterrupt(void);
+ 
+ /* In signalmodule.c */
+-int PySignal_SetWakeupFd(int fd);
+PyAPI_FUNC(int) PySignal_SetWakeupFd(int fd);
+ 
+ /* Support for adding program text to SyntaxErrors */
+ PyAPI_FUNC(void) PyErr_SyntaxLocation(const char *, int);
--- a/python2/2.7.5-getpath-exe-extension.patch
+++ b/python2/2.7.5-getpath-exe-extension.patch
@@ -0,0 +1,32 @@
+diff -urN a/Modules/getpath.c b/Modules/getpath.c
+--- a/Modules/getpath.c	2013-10-20 19:34:40.007865900 +0100
+++ b/Modules/getpath.c	2013-10-20 19:35:08.184477500 +0100
+@@ -451,6 +451,28 @@
+                         if (isxfile(progpath))
+                                 break;
+ 
+#ifdef __CYGWIN__
+                        /*
+                         * Cygwin automatically removes the ".exe" extension from argv[0]
+                         * to make programs feel like they are in a more Unix-like
+                         * environment.  Unfortunately, this can make it problemmatic for
+                         * Cygwin to distinguish between a directory and an executable with
+                         * the same name excluding the ".exe" extension.  For example, the
+                         * Cygwin Python build directory has a "Python" directory and a
+                         * "python.exe" executable.  This causes isxfile() to erroneously
+                         * return false.  If isdir() returns true and there is enough space
+                         * to append the ".exe" extension, then we try again with the
+                         * extension appended.
+                         */
+#define EXE ".exe"
+                        if (isdir(progpath) && strlen(progpath) + strlen(EXE) <= MAXPATHLEN)
+                        {
+                            strcat(progpath, EXE);
+                            if (isxfile(progpath))
+                                break;
+                        }
+#endif /* __CYGWIN__ */
+
+                         if (!delim) {
+                                 progpath[0] = '\0';
+                                 break;
--- a/python2/2.7.5-ncurses-abi6.patch
+++ b/python2/2.7.5-ncurses-abi6.patch
@@ -0,0 +1,17 @@
+diff -urN a/Include/py_curses.h b/Include/py_curses.h
+--- a/Include/py_curses.h	2013-10-20 19:31:55.902479600 +0100
+++ b/Include/py_curses.h	2013-10-20 19:32:30.732471800 +0100
+@@ -17,6 +17,13 @@
+ #define NCURSES_OPAQUE 0
+ #endif /* __APPLE__ */
+ 
+#ifdef __CYGWIN__
+/* the following define is necessary for Cygwin; without it, the
+   Cygwin-supplied ncurses.h sets NCURSES_OPAQUE to 1, and then Python
+   can't get at the WINDOW flags field. */
+#define NCURSES_INTERNALS
+#endif /* __CYGWIN__ */
+
+ #ifdef __FreeBSD__
+ /*
+ ** On FreeBSD, [n]curses.h and stdlib.h/wchar.h use different guards
--- a/python2/2.7.5-no-libm.patch
+++ b/python2/2.7.5-no-libm.patch
@@ -0,0 +1,12 @@
+diff -urN a/setup.py b/setup.py
+--- a/setup.py	2013-10-20 19:35:36.296085400 +0100
+++ b/setup.py	2013-10-20 19:36:03.716653800 +0100
+@@ -549,7 +549,7 @@
+ 
+         # Check for MacOS X, which doesn't need libm.a at all
+         math_libs = ['m']
+-        if host_platform in ['darwin', 'beos']:
+        if host_platform in ['darwin', 'beos', 'cygwin']:
+             math_libs = []
+ 
+         # XXX Omitted modules: gl, pure, dl, SGI-specific modules
--- a/python2/2.7.5-ssl-threads.patch
+++ b/python2/2.7.5-ssl-threads.patch
@@ -0,0 +1,14 @@
+diff -urN a/Modules/_ssl.c b/Modules/_ssl.c
+--- a/Modules/_ssl.c	2013-10-20 19:29:32.975304600 +0100
+++ b/Modules/_ssl.c	2013-10-20 19:30:00.858899500 +0100
+@@ -16,6 +16,10 @@
+ 
+ #include "Python.h"
+ 
+#ifdef __CYGWIN__
+#undef WITH_THREAD
+#endif
+
+ #ifdef WITH_THREAD
+ #include "pythread.h"
+ #define PySSL_BEGIN_ALLOW_THREADS { \
--- a/python2/2.7.5-tkinter-x11.patch
+++ b/python2/2.7.5-tkinter-x11.patch
@@ -0,0 +1,28 @@
+diff -urN a/setup.py b/setup.py
+--- a/setup.py	2013-10-20 19:28:33.249888500 +0100
+++ b/setup.py	2013-10-20 19:28:56.054192900 +0100
+@@ -1874,12 +1874,6 @@
+             include_dirs.append('/usr/X11/include')
+             added_lib_dirs.append('/usr/X11/lib')
+ 
+-        # If Cygwin, then verify that X is installed before proceeding
+-        if host_platform == 'cygwin':
+-            x11_inc = find_file('X11/Xlib.h', [], include_dirs)
+-            if x11_inc is None:
+-                return
+-
+         # Check for BLT extension
+         if self.compiler.find_library_file(lib_dirs + added_lib_dirs,
+                                                'BLT8.0'):
+@@ -1897,9 +1891,8 @@
+         if host_platform in ['aix3', 'aix4']:
+             libs.append('ld')
+ 
+-        # Finally, link with the X11 libraries (not appropriate on cygwin)
+-        if host_platform != "cygwin":
+-            libs.append('X11')
+        # Finally, link with the X11 libraries
+        libs.append('X11')
+ 
+         ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
+                         define_macros=[('WITH_APPINIT', 1)] + defs,
--- a/python2/PKGBUILD
+++ b/python2/PKGBUILD
@@ -0,0 +1,157 @@
+# Maintainer: Alexey Pavlov <Alexpux@gmail.com>
+
+pkgname=python2
+pkgver=2.7.5
+pkgrel=1
+_pybasever=2.7
+pkgdesc="A high-level scripting language"
+arch=('i686' 'x86_64')
+license=('PSF')
+url="http://www.python.org/"
+depends=('bzip2' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
+#makedepends=('tk>=8.6.0')
+optdepends=('tk: for IDLE')
+conflicts=('python<3')
+options=('!makeflags')
+source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
+		python-2.7.5-CVE-2013-4238.patch
+		uuid.patch
+		Python-2.7.5-reorder-bininstall-ln-symlink-creation.patch
+		python-2.7.5-msys2.patch
+		Python-2.7.5-fix-sqlite-module.patch
+		2.7.5-tkinter-x11.patch
+		2.7.5-ssl-threads.patch
+		2.7.5-no-libm.patch
+		2.7.5-ncurses-abi6.patch
+		2.7.5-getpath-exe-extension.patch
+		2.7.5-FD_SETSIZE.patch
+		2.7.5-export-PySignal_SetWakeupFd.patch
+		2.7.5-export-PyNode_SizeOf.patch
+		2.7.5-dylib.patch
+		2.7.5-dbm.patch
+		2.7.5-ctypes-util-find_library.patch
+		2.7.5-allow-windows-paths-for-executable.patch)
+sha1sums=('b7389791f789625c2ba9d897aa324008ff482daf'
+          'fb1f95ca21d9c00eaaea5a58236d1d97300482d7'
+          '589f93f70c9d51f8ed025d0546ea38312c430d21'
+          '76474752d5b84ad78d53f418d554b5c706fcbca7'
+          '2b5f115573d089801f023c16bacc08963f039272'
+          '6e842d2ac2ef6dae07ca14c75348addf6621bf24'
+          '53a3a7c2cd5412bc382d94043983362da80aed03'
+          '7dfd15538406481a1e87edc6d1ad5480c997201a'
+          '91ed9faad8f4ae97b5a69bfb8690401047f0178f'
+          'dbbf0ebb32663740062106bb232157af262767ae'
+          'e9764f8c852d7f19a995f2f1cc38d94ba036e007'
+          'de7bb49c1e6a34bf3abee109f69bedb4e4e686a9'
+          'cfce9aa371d876c7bf47732a4271f1201028ce7a'
+          'eee4ce3f7c26b5c69729d2a5033d2f5277bc6868'
+          'eaf864af38e8b2bd3952ca9e7fbb6efb6191b792'
+          'f6e392723ed2a4b7fe0138522baa0e0f7b8b3660'
+          'efbee46e7f1485985409db0f25adbb18ecb4a4ae'
+          'fb78069fadcf5394ba380e26e371ad687d344415')
+
+prepare() {
+  cd "${srcdir}/Python-${pkgver}"
+
+  # http://bugs.python.org/issue18709
+  patch -Np1 -i ${srcdir}/python-2.7.5-CVE-2013-4238.patch
+
+  patch -p1 -i ${srcdir}/2.7.5-ctypes-util-find_library.patch
+  patch -p1 -i ${srcdir}/2.7.5-tkinter-x11.patch
+  patch -p1 -i ${srcdir}/2.7.5-ssl-threads.patch
+  patch -p1 -i ${srcdir}/2.7.5-FD_SETSIZE.patch
+  patch -p1 -i ${srcdir}/2.7.5-export-PySignal_SetWakeupFd.patch
+  patch -p1 -i ${srcdir}/2.7.5-ncurses-abi6.patch
+  patch -p1 -i ${srcdir}/2.7.5-dbm.patch
+  patch -p1 -i ${srcdir}/2.7.5-dylib.patch
+  patch -p1 -i ${srcdir}/2.7.5-getpath-exe-extension.patch
+  patch -p1 -i ${srcdir}/2.7.5-no-libm.patch
+  patch -p1 -i ${srcdir}/2.7.5-export-PyNode_SizeOf.patch
+  patch -p1 -i ${srcdir}/Python-2.7.5-fix-sqlite-module.patch
+  patch -p1 -i ${srcdir}/python-2.7.5-msys2.patch
+  patch -p1 -i ${srcdir}/Python-2.7.5-reorder-bininstall-ln-symlink-creation.patch
+  patch -p1 -i ${srcdir}/uuid.patch
+  
+  # Incomplete patch from Ray Donnelly
+  # patch -p1 -i ${srcdir}/2.7.5-allow-windows-paths-for-executable.patch
+	
+  # Temporary workaround for FS#22322
+  # See http://bugs.python.org/issue10835 for upstream report
+  sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c
+
+  # Enable built-in SQLite module to load extensions (fix FS#22122)
+  sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
+
+  # FS#23997
+  sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py
+
+  sed -i "s/python2.3/python2/g" Lib/distutils/tests/test_build_scripts.py \
+     Lib/distutils/tests/test_install_scripts.py Tools/scripts/gprof2html.py
+
+  # Ensure that we are using the system copy of various libraries (expat, zlib and libffi),
+  # rather than copies shipped in the tarball
+  rm -r Modules/expat
+  rm -r Modules/zlib
+  rm -r Modules/_ctypes/{darwin,libffi}*
+}
+
+build() {
+  cd "${srcdir}/Python-${pkgver}"
+
+  export OPT="${CFLAGS}"
+  ./configure --build=${CHOST} \
+		--prefix=/usr \
+		--enable-shared \
+		--enable-ipv6 \
+		--with-libc= \
+		--with-libm= \
+		--with-system-expat \
+		--with-system-ffi \
+		--with-threads \
+		ac_cv_func_bind_textdomain_codeset=yes \
+		CPPFLAGS="${CPPFLAGS} -I/usr/include/ncursesw" \
+		LDFLAGS="${LDFLAGS} -L."
+
+  make
+}
+
+package() {
+  cd "${srcdir}/Python-${pkgver}"
+  make DESTDIR="${pkgdir}" altinstall maninstall
+  
+  rm "${pkgdir}"/usr/share/man/man1/python.1
+
+  ln -sf python${_pybasever}        "${pkgdir}"/usr/bin/python2.exe
+  ln -sf python${_pybasever}-config "${pkgdir}"/usr/bin/python2-config
+  ln -sf python${_pybasever}.1      "${pkgdir}"/usr/share/man/man1/python2.1
+
+  # FS#33954
+  ln -sf python-${_pybasever}.pc    "${pkgdir}"/usr/lib/pkgconfig/python2.pc
+
+  cp -f "${pkgdir}"/usr/lib/python${_pybasever}/config/libpython${_pybasever}.dll.a "${pkgdir}"/usr/lib/libpython${_pybasever}.dll.a
+
+  mv "${pkgdir}"/usr/bin/smtpd.py "${pkgdir}"/usr/lib/python${_pybasever}/
+
+  # some useful "stuff"
+  install -dm755 "${pkgdir}"/usr/lib/python${_pybasever}/Tools/{i18n,scripts}
+  install -m755 Tools/i18n/{msgfmt,pygettext}.py "${pkgdir}"/usr/lib/python${_pybasever}/Tools/i18n/
+  install -m755 Tools/scripts/{README,*py} "${pkgdir}"/usr/lib/python${_pybasever}/Tools/scripts/
+
+  # fix conflicts with python
+  mv "${pkgdir}"/usr/bin/idle{,2}
+  mv "${pkgdir}"/usr/bin/pydoc{,2}
+  mv "${pkgdir}"/usr/bin/2to3{,-2.7}
+
+  # clean up #!s
+  find "${pkgdir}"/usr/lib/python${_pybasever}/ -name '*.py' | \
+    xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
+
+  # clean-up reference to build directory
+  sed -i "s#${srcdir}/Python-${pkgver}:##" "${pkgdir}"/usr/lib/python${_pybasever}/config/Makefile
+
+  # license
+  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+  
+  # fix permissons
+  find ${pkgdir}/usr -type f \( -name *.dll -o -name *.exe \) | xargs chmod 0755
+}
--- a/python2/Python-2.7.5-fix-sqlite-module.patch
+++ b/python2/Python-2.7.5-fix-sqlite-module.patch
@@ -0,0 +1,16 @@
+diff -urN a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
+--- a/Modules/_sqlite/connection.c	2013-10-20 19:37:19.768003700 +0100
+++ b/Modules/_sqlite/connection.c	2013-10-20 19:37:56.224088800 +0100
+@@ -781,9 +781,12 @@
+     }
+ 
+ error:
+    {
+ #ifdef WITH_THREAD
+     PyGILState_Release(threadstate);
+ #endif
+      ;
+    }
+ }
+ 
+ static void _pysqlite_drop_unused_statement_references(pysqlite_Connection* self)
--- a/python2/Python-2.7.5-reorder-bininstall-ln-symlink-creation.patch
+++ b/python2/Python-2.7.5-reorder-bininstall-ln-symlink-creation.patch
@@ -0,0 +1,14 @@
+diff -urN a/Makefile.pre.in b/Makefile.pre.in
+--- a/Makefile.pre.in	2013-10-20 19:39:13.666518300 +0100
+++ b/Makefile.pre.in	2013-10-20 19:39:42.365159700 +0100
+@@ -850,9 +850,9 @@
+ 	then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
+ 	else true; \
+ 	fi
+-	(cd $(DESTDIR)$(BINDIR); $(LN) -s python2$(EXE) $(PYTHON))
+ 	-rm -f $(DESTDIR)$(BINDIR)/python2$(EXE)
+ 	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python2$(EXE))
+	(cd $(DESTDIR)$(BINDIR); $(LN) -s python2$(EXE) $(PYTHON))
+ 	-rm -f $(DESTDIR)$(BINDIR)/python2-config
+ 	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python2-config)
+ 	-rm -f $(DESTDIR)$(BINDIR)/python-config
--- a/python2/python-2.7.5-CVE-2013-4238.patch
+++ b/python2/python-2.7.5-CVE-2013-4238.patch
@@ -0,0 +1,267 @@
+
+# HG changeset patch
+# User Christian Heimes <christian@cheimes.de>
+# Date 1376693687 -7200
+# Node ID bd2360476bdbb1477b81b0e18b8d86b3452ba77b
+# Parent  87fcc13ade91874971ad577efaa2254c744a2b07
+Issue #18709: Fix CVE-2013-4238. The SSL module now handles NULL bytes
+inside subjectAltName correctly. Formerly the module has used OpenSSL's
+GENERAL_NAME_print() function to get the string represention of ASN.1
+strings for rfc822Name (email), dNSName (DNS) and
+uniformResourceIdentifier (URI).
+
+diff --git a/Lib/test/nullbytecert.pem b/Lib/test/nullbytecert.pem
+new file mode 100644
+--- /dev/null
+++ b/Lib/test/nullbytecert.pem
+@@ -0,0 +1,90 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 0 (0x0)
+    Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org
+        Validity
+            Not Before: Aug  7 13:11:52 2013 GMT
+            Not After : Aug  7 13:12:52 2013 GMT
+        Subject: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (2048 bit)
+                Modulus:
+                    00:b5:ea:ed:c9:fb:46:7d:6f:3b:76:80:dd:3a:f3:
+                    03:94:0b:a7:a6:db:ec:1d:df:ff:23:74:08:9d:97:
+                    16:3f:a3:a4:7b:3e:1b:0e:96:59:25:03:a7:26:e2:
+                    88:a9:cf:79:cd:f7:04:56:b0:ab:79:32:6e:59:c1:
+                    32:30:54:eb:58:a8:cb:91:f0:42:a5:64:27:cb:d4:
+                    56:31:88:52:ad:cf:bd:7f:f0:06:64:1f:cc:27:b8:
+                    a3:8b:8c:f3:d8:29:1f:25:0b:f5:46:06:1b:ca:02:
+                    45:ad:7b:76:0a:9c:bf:bb:b9:ae:0d:16:ab:60:75:
+                    ae:06:3e:9c:7c:31:dc:92:2f:29:1a:e0:4b:0c:91:
+                    90:6c:e9:37:c5:90:d7:2a:d7:97:15:a3:80:8f:5d:
+                    7b:49:8f:54:30:d4:97:2c:1c:5b:37:b5:ab:69:30:
+                    68:43:d3:33:78:4b:02:60:f5:3c:44:80:a1:8f:e7:
+                    f0:0f:d1:5e:87:9e:46:cf:62:fc:f9:bf:0c:65:12:
+                    f1:93:c8:35:79:3f:c8:ec:ec:47:f5:ef:be:44:d5:
+                    ae:82:1e:2d:9a:9f:98:5a:67:65:e1:74:70:7c:cb:
+                    d3:c2:ce:0e:45:49:27:dc:e3:2d:d4:fb:48:0e:2f:
+                    9e:77:b8:14:46:c0:c4:36:ca:02:ae:6a:91:8c:da:
+                    2f:85
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:FALSE
+            X509v3 Subject Key Identifier:
+                88:5A:55:C0:52:FF:61:CD:52:A3:35:0F:EA:5A:9C:24:38:22:F7:5C
+            X509v3 Key Usage:
+                Digital Signature, Non Repudiation, Key Encipherment
+            X509v3 Subject Alternative Name:
+                *************************************************************
+                WARNING: The values for DNS, email and URI are WRONG. OpenSSL
+                         doesn't print the text after a NULL byte.
+                *************************************************************
+                DNS:altnull.python.org, email:null@python.org, URI:http://null.python.org, IP Address:192.0.2.1, IP Address:2001:DB8:0:0:0:0:0:1
+    Signature Algorithm: sha1WithRSAEncryption
+         ac:4f:45:ef:7d:49:a8:21:70:8e:88:59:3e:d4:36:42:70:f5:
+         a3:bd:8b:d7:a8:d0:58:f6:31:4a:b1:a4:a6:dd:6f:d9:e8:44:
+         3c:b6:0a:71:d6:7f:b1:08:61:9d:60:ce:75:cf:77:0c:d2:37:
+         86:02:8d:5e:5d:f9:0f:71:b4:16:a8:c1:3d:23:1c:f1:11:b3:
+         56:6e:ca:d0:8d:34:94:e6:87:2a:99:f2:ae:ae:cc:c2:e8:86:
+         de:08:a8:7f:c5:05:fa:6f:81:a7:82:e6:d0:53:9d:34:f4:ac:
+         3e:40:fe:89:57:7a:29:a4:91:7e:0b:c6:51:31:e5:10:2f:a4:
+         60:76:cd:95:51:1a:be:8b:a1:b0:fd:ad:52:bd:d7:1b:87:60:
+         d2:31:c7:17:c4:18:4f:2d:08:25:a3:a7:4f:b7:92:ca:e2:f5:
+         25:f1:54:75:81:9d:b3:3d:61:a2:f7:da:ed:e1:c6:6f:2c:60:
+         1f:d8:6f:c5:92:05:ab:c9:09:62:49:a9:14:ad:55:11:cc:d6:
+         4a:19:94:99:97:37:1d:81:5f:8b:cf:a3:a8:96:44:51:08:3d:
+         0b:05:65:12:eb:b6:70:80:88:48:72:4f:c6:c2:da:cf:cd:8e:
+         5b:ba:97:2f:60:b4:96:56:49:5e:3a:43:76:63:04:be:2a:f6:
+         c1:ca:a9:94
+-----BEGIN CERTIFICATE-----
+MIIE2DCCA8CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBxTELMAkGA1UEBhMCVVMx
+DzANBgNVBAgMBk9yZWdvbjESMBAGA1UEBwwJQmVhdmVydG9uMSMwIQYDVQQKDBpQ
+eXRob24gU29mdHdhcmUgRm91bmRhdGlvbjEgMB4GA1UECwwXUHl0aG9uIENvcmUg
+RGV2ZWxvcG1lbnQxJDAiBgNVBAMMG251bGwucHl0aG9uLm9yZwBleGFtcGxlLm9y
+ZzEkMCIGCSqGSIb3DQEJARYVcHl0aG9uLWRldkBweXRob24ub3JnMB4XDTEzMDgw
+NzEzMTE1MloXDTEzMDgwNzEzMTI1MlowgcUxCzAJBgNVBAYTAlVTMQ8wDQYDVQQI
+DAZPcmVnb24xEjAQBgNVBAcMCUJlYXZlcnRvbjEjMCEGA1UECgwaUHl0aG9uIFNv
+ZnR3YXJlIEZvdW5kYXRpb24xIDAeBgNVBAsMF1B5dGhvbiBDb3JlIERldmVsb3Bt
+ZW50MSQwIgYDVQQDDBtudWxsLnB5dGhvbi5vcmcAZXhhbXBsZS5vcmcxJDAiBgkq
+hkiG9w0BCQEWFXB5dGhvbi1kZXZAcHl0aG9uLm9yZzCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBALXq7cn7Rn1vO3aA3TrzA5QLp6bb7B3f/yN0CJ2XFj+j
+pHs+Gw6WWSUDpybiiKnPec33BFawq3kyblnBMjBU61ioy5HwQqVkJ8vUVjGIUq3P
+vX/wBmQfzCe4o4uM89gpHyUL9UYGG8oCRa17dgqcv7u5rg0Wq2B1rgY+nHwx3JIv
+KRrgSwyRkGzpN8WQ1yrXlxWjgI9de0mPVDDUlywcWze1q2kwaEPTM3hLAmD1PESA
+oY/n8A/RXoeeRs9i/Pm/DGUS8ZPINXk/yOzsR/XvvkTVroIeLZqfmFpnZeF0cHzL
+08LODkVJJ9zjLdT7SA4vnne4FEbAxDbKAq5qkYzaL4UCAwEAAaOB0DCBzTAMBgNV
+HRMBAf8EAjAAMB0GA1UdDgQWBBSIWlXAUv9hzVKjNQ/qWpwkOCL3XDALBgNVHQ8E
+BAMCBeAwgZAGA1UdEQSBiDCBhYIeYWx0bnVsbC5weXRob24ub3JnAGV4YW1wbGUu
+Y29tgSBudWxsQHB5dGhvbi5vcmcAdXNlckBleGFtcGxlLm9yZ4YpaHR0cDovL251
+bGwucHl0aG9uLm9yZwBodHRwOi8vZXhhbXBsZS5vcmeHBMAAAgGHECABDbgAAAAA
+AAAAAAAAAAEwDQYJKoZIhvcNAQEFBQADggEBAKxPRe99SaghcI6IWT7UNkJw9aO9
+i9eo0Fj2MUqxpKbdb9noRDy2CnHWf7EIYZ1gznXPdwzSN4YCjV5d+Q9xtBaowT0j
+HPERs1ZuytCNNJTmhyqZ8q6uzMLoht4IqH/FBfpvgaeC5tBTnTT0rD5A/olXeimk
+kX4LxlEx5RAvpGB2zZVRGr6LobD9rVK91xuHYNIxxxfEGE8tCCWjp0+3ksri9SXx
+VHWBnbM9YaL32u3hxm8sYB/Yb8WSBavJCWJJqRStVRHM1koZlJmXNx2BX4vPo6iW
+RFEIPQsFZRLrtnCAiEhyT8bC2s/Njlu6ly9gtJZWSV46Q3ZjBL4q9sHKqZQ=
+-----END CERTIFICATE-----
+diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
+--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
+@@ -25,6 +25,7 @@ ssl = test_support.import_module("ssl")
+ HOST = test_support.HOST
+ CERTFILE = None
+ SVN_PYTHON_ORG_ROOT_CERT = None
+NULLBYTECERT = None
+ 
+ def handle_error(prefix):
+     exc_format = ' '.join(traceback.format_exception(*sys.exc_info()))
+@@ -123,6 +124,27 @@ class BasicSocketTests(unittest.TestCase
+                           ('DNS', 'projects.forum.nokia.com'))
+                         )
+ 
+    def test_parse_cert_CVE_2013_4238(self):
+        p = ssl._ssl._test_decode_cert(NULLBYTECERT)
+        if test_support.verbose:
+            sys.stdout.write("\n" + pprint.pformat(p) + "\n")
+        subject = ((('countryName', 'US'),),
+                   (('stateOrProvinceName', 'Oregon'),),
+                   (('localityName', 'Beaverton'),),
+                   (('organizationName', 'Python Software Foundation'),),
+                   (('organizationalUnitName', 'Python Core Development'),),
+                   (('commonName', 'null.python.org\x00example.org'),),
+                   (('emailAddress', 'python-dev@python.org'),))
+        self.assertEqual(p['subject'], subject)
+        self.assertEqual(p['issuer'], subject)
+        self.assertEqual(p['subjectAltName'],
+                         (('DNS', 'altnull.python.org\x00example.com'),
+                         ('email', 'null@python.org\x00user@example.org'),
+                         ('URI', 'http://null.python.org\x00http://example.org'),
+                         ('IP Address', '192.0.2.1'),
+                         ('IP Address', '2001:DB8:0:0:0:0:0:1\n'))
+                        )
+
+     def test_DER_to_PEM(self):
+         with open(SVN_PYTHON_ORG_ROOT_CERT, 'r') as f:
+             pem = f.read()
+@@ -1360,7 +1382,7 @@ else:
+ 
+ 
+ def test_main(verbose=False):
+-    global CERTFILE, SVN_PYTHON_ORG_ROOT_CERT, NOKIACERT
+    global CERTFILE, SVN_PYTHON_ORG_ROOT_CERT, NOKIACERT, NULLBYTECERT
+     CERTFILE = os.path.join(os.path.dirname(__file__) or os.curdir,
+                             "keycert.pem")
+     SVN_PYTHON_ORG_ROOT_CERT = os.path.join(
+@@ -1368,10 +1390,13 @@ def test_main(verbose=False):
+         "https_svn_python_org_root.pem")
+     NOKIACERT = os.path.join(os.path.dirname(__file__) or os.curdir,
+                              "nokia.pem")
+    NULLBYTECERT = os.path.join(os.path.dirname(__file__) or os.curdir,
+                                "nullbytecert.pem")
+ 
+     if (not os.path.exists(CERTFILE) or
+         not os.path.exists(SVN_PYTHON_ORG_ROOT_CERT) or
+-        not os.path.exists(NOKIACERT)):
+        not os.path.exists(NOKIACERT) or
+        not os.path.exists(NULLBYTECERT)):
+         raise test_support.TestFailed("Can't read certificate files!")
+ 
+     tests = [BasicTests, BasicSocketTests]
+diff --git a/Modules/_ssl.c b/Modules/_ssl.c
+--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
+@@ -738,13 +738,16 @@ static PyObject *
+                                                   ext->value->length));
+ 
+         for(j = 0; j < sk_GENERAL_NAME_num(names); j++) {
+-
+             /* get a rendering of each name in the set of names */
+            int gntype;
+            ASN1_STRING *as = NULL;
+ 
+             name = sk_GENERAL_NAME_value(names, j);
+-            if (name->type == GEN_DIRNAME) {
+-
+-                /* we special-case DirName as a tuple of tuples of attributes */
+            gntype = name-> type;
+            switch (gntype) {
+            case GEN_DIRNAME:
+                /* we special-case DirName as a tuple of
+                   tuples of attributes */
+ 
+                 t = PyTuple_New(2);
+                 if (t == NULL) {
+@@ -764,11 +767,61 @@ static PyObject *
+                     goto fail;
+                 }
+                 PyTuple_SET_ITEM(t, 1, v);
+                break;
+ 
+-            } else {
+            case GEN_EMAIL:
+            case GEN_DNS:
+            case GEN_URI:
+                /* GENERAL_NAME_print() doesn't handle NULL bytes in ASN1_string
+                   correctly, CVE-2013-4238 */
+                t = PyTuple_New(2);
+                if (t == NULL)
+                    goto fail;
+                switch (gntype) {
+                case GEN_EMAIL:
+                    v = PyString_FromString("email");
+                    as = name->d.rfc822Name;
+                    break;
+                case GEN_DNS:
+                    v = PyString_FromString("DNS");
+                    as = name->d.dNSName;
+                    break;
+                case GEN_URI:
+                    v = PyString_FromString("URI");
+                    as = name->d.uniformResourceIdentifier;
+                    break;
+                }
+                if (v == NULL) {
+                    Py_DECREF(t);
+                    goto fail;
+                }
+                PyTuple_SET_ITEM(t, 0, v);
+                v = PyString_FromStringAndSize((char *)ASN1_STRING_data(as),
+                                               ASN1_STRING_length(as));
+                if (v == NULL) {
+                    Py_DECREF(t);
+                    goto fail;
+                }
+                PyTuple_SET_ITEM(t, 1, v);
+                break;
+ 
+            default:
+                 /* for everything else, we use the OpenSSL print form */
+-
+                switch (gntype) {
+                    /* check for new general name type */
+                    case GEN_OTHERNAME:
+                    case GEN_X400:
+                    case GEN_EDIPARTY:
+                    case GEN_IPADD:
+                    case GEN_RID:
+                        break;
+                    default:
+                        if (PyErr_Warn(PyExc_RuntimeWarning,
+                                       "Unknown general name type") == -1) {
+                            goto fail;
+                        }
+                        break;
+                }
+                 (void) BIO_reset(biobuf);
+                 GENERAL_NAME_print(biobuf, name);
+                 len = BIO_gets(biobuf, buf, sizeof(buf)-1);
+@@ -794,6 +847,7 @@ static PyObject *
+                     goto fail;
+                 }
+                 PyTuple_SET_ITEM(t, 1, v);
+                break;
+             }
+ 
+             /* and add that rendering to the list */
+
--- a/python2/python-2.7.5-msys2.patch
+++ b/python2/python-2.7.5-msys2.patch
--- a/python2/uuid.patch
+++ b/python2/uuid.patch
@@ -0,0 +1,12 @@
+diff -urN a/Lib/uuid.py b/Lib/uuid.py
+--- a/Lib/uuid.py	2013-10-20 19:40:07.732610700 +0100
+++ b/Lib/uuid.py	2013-10-20 19:40:39.586432600 +0100
+@@ -408,6 +408,8 @@
+             _uuid_generate_random = lib.uuid_generate_random
+         if hasattr(lib, 'uuid_generate_time'):
+             _uuid_generate_time = lib.uuid_generate_time
+            if _uuid_generate_random is not None:
+                break  # found everything we were looking for
+ 
+     # The uuid_generate_* functions are broken on MacOS X 10.5, as noted
+     # in issue #8621 the function generates the same sequence of values