diff --git a/python2/2.7.5-ctypes-util-find_library.patch b/python2/0010-ctypes-util-find_library.patch
similarity index 87%
rename from python2/2.7.5-ctypes-util-find_library.patch
rename to python2/0010-ctypes-util-find_library.patch
index 0aa79e73..fcae2333 100644
--- a/python2/2.7.5-ctypes-util-find_library.patch
+++ b/python2/0010-ctypes-util-find_library.patch
@@ -1,6 +1,6 @@
-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
+diff -Naur a/Lib/ctypes/util.py b/Lib/ctypes/util.py
+--- a/Lib/ctypes/util.py	2014-05-31 22:58:38.000000000 +0400
++++ b/Lib/ctypes/util.py	2014-06-04 10:16:33.994600000 +0400
 @@ -84,6 +84,20 @@
                  continue
          return None
diff --git a/python2/2.7.5-tkinter-x11.patch b/python2/0020-tkinter-x11.patch
similarity index 84%
rename from python2/2.7.5-tkinter-x11.patch
rename to python2/0020-tkinter-x11.patch
index a7322551..58d12101 100644
--- a/python2/2.7.5-tkinter-x11.patch
+++ b/python2/0020-tkinter-x11.patch
@@ -1,7 +1,7 @@
-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 @@
+diff -Naur a/setup.py b/setup.py
+--- a/setup.py	2014-05-31 22:58:40.000000000 +0400
++++ b/setup.py	2014-06-04 10:16:36.428200000 +0400
+@@ -1927,12 +1927,6 @@
              include_dirs.append('/usr/X11/include')
              added_lib_dirs.append('/usr/X11/lib')
  
@@ -14,7 +14,7 @@ diff -urN a/setup.py b/setup.py
          # Check for BLT extension
          if self.compiler.find_library_file(lib_dirs + added_lib_dirs,
                                                 'BLT8.0'):
-@@ -1897,9 +1891,8 @@
+@@ -1950,9 +1944,8 @@
          if host_platform in ['aix3', 'aix4']:
              libs.append('ld')
  
diff --git a/python2/0030-ssl-threads.patch b/python2/0030-ssl-threads.patch
new file mode 100644
index 00000000..ddf402ce
--- /dev/null
+++ b/python2/0030-ssl-threads.patch
@@ -0,0 +1,14 @@
+diff -Naur a/Modules/_ssl.c b/Modules/_ssl.c
+--- a/Modules/_ssl.c	2014-05-31 22:58:40.000000000 +0400
++++ b/Modules/_ssl.c	2014-06-04 10:16:38.737000000 +0400
+@@ -16,6 +16,10 @@
+ 
+ #include "Python.h"
+ 
++#ifdef __CYGWIN__
++#undef WITH_THREAD
++#endif
++
+ #ifdef WITH_THREAD
+ #include "pythread.h"
+ 
diff --git a/python2/2.7.5-FD_SETSIZE.patch b/python2/0040-FD_SETSIZE.patch
similarity index 86%
rename from python2/2.7.5-FD_SETSIZE.patch
rename to python2/0040-FD_SETSIZE.patch
index 86e89b30..07f6f289 100644
--- a/python2/2.7.5-FD_SETSIZE.patch
+++ b/python2/0040-FD_SETSIZE.patch
@@ -1,6 +1,6 @@
-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
+diff -Naur a/Modules/selectmodule.c b/Modules/selectmodule.c
+--- a/Modules/selectmodule.c	2014-05-31 22:58:40.000000000 +0400
++++ b/Modules/selectmodule.c	2014-06-04 10:16:41.077000000 +0400
 @@ -6,6 +6,21 @@
     >= 0.
  */
diff --git a/python2/2.7.5-export-PySignal_SetWakeupFd.patch b/python2/0050-export-PySignal_SetWakeupFd.patch
similarity index 62%
rename from python2/2.7.5-export-PySignal_SetWakeupFd.patch
rename to python2/0050-export-PySignal_SetWakeupFd.patch
index 7237683e..3c8d8ef4 100644
--- a/python2/2.7.5-export-PySignal_SetWakeupFd.patch
+++ b/python2/0050-export-PySignal_SetWakeupFd.patch
@@ -1,6 +1,6 @@
-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
+diff -Naur a/Include/pyerrors.h b/Include/pyerrors.h
+--- a/Include/pyerrors.h	2014-05-31 22:58:38.000000000 +0400
++++ b/Include/pyerrors.h	2014-06-04 10:16:43.573000000 +0400
 @@ -231,7 +231,7 @@
  PyAPI_FUNC(void) PyErr_SetInterrupt(void);
  
diff --git a/python2/2.7.5-ncurses-abi6.patch b/python2/0060-ncurses-abi6.patch
similarity index 70%
rename from python2/2.7.5-ncurses-abi6.patch
rename to python2/0060-ncurses-abi6.patch
index c2a79a00..01a4ecea 100644
--- a/python2/2.7.5-ncurses-abi6.patch
+++ b/python2/0060-ncurses-abi6.patch
@@ -1,6 +1,6 @@
-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
+diff -Naur a/Include/py_curses.h b/Include/py_curses.h
+--- a/Include/py_curses.h	2014-05-31 22:58:38.000000000 +0400
++++ b/Include/py_curses.h	2014-06-04 10:16:45.959800000 +0400
 @@ -17,6 +17,13 @@
  #define NCURSES_OPAQUE 0
  #endif /* __APPLE__ */
diff --git a/python2/2.7.5-dbm.patch b/python2/0070-dbm.patch
similarity index 85%
rename from python2/2.7.5-dbm.patch
rename to python2/0070-dbm.patch
index 065f60bf..f93463ea 100644
--- a/python2/2.7.5-dbm.patch
+++ b/python2/0070-dbm.patch
@@ -1,7 +1,7 @@
-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 @@
+diff -Naur a/setup.py b/setup.py
+--- a/setup.py	2014-06-04 10:16:38.581000000 +0400
++++ b/setup.py	2014-06-04 10:16:48.081400000 +0400
+@@ -1231,7 +1231,7 @@
  
          dbm_order = ['gdbm']
          # The standard Unix dbm module:
@@ -10,7 +10,7 @@ diff -urN a/setup.py b/setup.py
              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 @@
+@@ -1286,6 +1286,15 @@
                                      ],
                                  libraries = gdbm_libs)
                              break
diff --git a/python2/2.7.5-dylib.patch b/python2/0080-dylib.patch
similarity index 57%
rename from python2/2.7.5-dylib.patch
rename to python2/0080-dylib.patch
index 8b6504a5..ed4310c5 100644
--- a/python2/2.7.5-dylib.patch
+++ b/python2/0080-dylib.patch
@@ -1,6 +1,6 @@
-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
+diff -Naur a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py
+--- a/Lib/distutils/unixccompiler.py	2014-05-31 22:58:38.000000000 +0400
++++ b/Lib/distutils/unixccompiler.py	2014-06-04 10:16:50.483800000 +0400
 @@ -82,6 +82,7 @@
      static_lib_format = shared_lib_format = dylib_lib_format = "lib%s%s"
      if sys.platform == "cygwin":
diff --git a/python2/2.7.5-getpath-exe-extension.patch b/python2/0090-getpath-exe-extension.patch
similarity index 89%
rename from python2/2.7.5-getpath-exe-extension.patch
rename to python2/0090-getpath-exe-extension.patch
index 8f7261b2..c3869395 100644
--- a/python2/2.7.5-getpath-exe-extension.patch
+++ b/python2/0090-getpath-exe-extension.patch
@@ -1,6 +1,6 @@
-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
+diff -Naur a/Modules/getpath.c b/Modules/getpath.c
+--- a/Modules/getpath.c	2014-05-31 22:58:40.000000000 +0400
++++ b/Modules/getpath.c	2014-06-04 10:16:52.777000000 +0400
 @@ -451,6 +451,28 @@
                          if (isxfile(progpath))
                                  break;
diff --git a/python2/2.7.5-no-libm.patch b/python2/0100-no-libm.patch
similarity index 65%
rename from python2/2.7.5-no-libm.patch
rename to python2/0100-no-libm.patch
index a1eb5249..ad75c444 100644
--- a/python2/2.7.5-no-libm.patch
+++ b/python2/0100-no-libm.patch
@@ -1,7 +1,7 @@
-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 @@
+diff -Naur a/setup.py b/setup.py
+--- a/setup.py	2014-06-04 10:16:50.343400000 +0400
++++ b/setup.py	2014-06-04 10:16:55.039000000 +0400
+@@ -551,7 +551,7 @@
  
          # Check for MacOS X, which doesn't need libm.a at all
          math_libs = ['m']
diff --git a/python2/2.7.5-export-PyNode_SizeOf.patch b/python2/0110-export-PyNode_SizeOf.patch
similarity index 64%
rename from python2/2.7.5-export-PyNode_SizeOf.patch
rename to python2/0110-export-PyNode_SizeOf.patch
index 9420f80e..e14e56f3 100644
--- a/python2/2.7.5-export-PyNode_SizeOf.patch
+++ b/python2/0110-export-PyNode_SizeOf.patch
@@ -1,6 +1,6 @@
-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
+diff -Naur a/Include/node.h b/Include/node.h
+--- a/Include/node.h	2014-05-31 22:58:38.000000000 +0400
++++ b/Include/node.h	2014-06-04 10:16:57.535000000 +0400
 @@ -21,7 +21,7 @@
                                        char *str, int lineno, int col_offset);
  PyAPI_FUNC(void) PyNode_Free(node *n);
diff --git a/python2/0120-fix-sqlite-module.patch b/python2/0120-fix-sqlite-module.patch
new file mode 100644
index 00000000..15cb2c3c
--- /dev/null
+++ b/python2/0120-fix-sqlite-module.patch
@@ -0,0 +1,16 @@
+diff -Naur a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
+--- a/Modules/_sqlite/connection.c	2014-05-31 22:58:40.000000000 +0400
++++ b/Modules/_sqlite/connection.c	2014-06-04 10:16:59.812600000 +0400
+@@ -783,9 +783,12 @@
+     }
+ 
+ error:
++    {
+ #ifdef WITH_THREAD
+     PyGILState_Release(threadstate);
+ #endif
++      ;
++    }
+ }
+ 
+ static void _pysqlite_drop_unused_statement_references(pysqlite_Connection* self)
diff --git a/python2/python-2.7.5-msys2.patch b/python2/0200-msys2.patch
similarity index 80%
rename from python2/python-2.7.5-msys2.patch
rename to python2/0200-msys2.patch
index f4f11c86..4e0f62e1 100644
--- a/python2/python-2.7.5-msys2.patch
+++ b/python2/0200-msys2.patch
@@ -1,7 +1,7 @@
-diff -urN a/config.guess b/config.guess
---- a/config.guess	2013-10-20 19:38:14.026107000 +0100
-+++ b/config.guess	2013-10-20 19:38:53.250350500 +0100
-@@ -849,6 +849,9 @@
+diff -Naur a/config.guess b/config.guess
+--- a/config.guess	2014-05-31 22:58:40.000000000 +0400
++++ b/config.guess	2014-06-04 10:17:02.215000000 +0400
+@@ -866,6 +866,9 @@
      amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
  	echo x86_64-unknown-cygwin
  	exit ;;
@@ -11,10 +11,10 @@ diff -urN a/config.guess b/config.guess
      p*:CYGWIN*:*)
  	echo powerpcle-unknown-cygwin
  	exit ;;
-diff -urN a/configure b/configure
---- a/configure	2013-10-20 19:38:14.028107200 +0100
-+++ b/configure	2013-10-20 19:38:53.321354600 +0100
-@@ -3174,6 +3174,9 @@
+diff -Naur a/configure b/configure
+--- a/configure	2014-05-31 22:58:40.000000000 +0400
++++ b/configure	2014-06-04 10:17:02.230600000 +0400
+@@ -3183,6 +3183,9 @@
  	*-*-cygwin*)
  		ac_sys_system=Cygwin
  		;;
@@ -24,7 +24,7 @@ diff -urN a/configure b/configure
  	*)
  		# for now, limit cross builds to known configurations
  		MACHDEP="unknown"
-@@ -3198,6 +3201,7 @@
+@@ -3207,6 +3210,7 @@
      case $MACHDEP in
  	linux*) MACHDEP="linux2";;
  	cygwin*) MACHDEP="cygwin";;
@@ -32,7 +32,7 @@ diff -urN a/configure b/configure
  	darwin*) MACHDEP="darwin";;
  	atheos*) MACHDEP="atheos";;
          irix646) MACHDEP="irix6";;
-@@ -3217,7 +3221,7 @@
+@@ -3226,7 +3230,7 @@
  			_host_cpu=$host_cpu
  		esac
  		;;
@@ -41,7 +41,7 @@ diff -urN a/configure b/configure
  		_host_cpu=
  		;;
  	*)
-@@ -5263,7 +5267,7 @@
+@@ -5272,7 +5276,7 @@
  if test -z "$enable_shared"
  then
    case $ac_sys_system in
@@ -50,7 +50,7 @@ diff -urN a/configure b/configure
      enable_shared="yes";;
    *)
      enable_shared="no";;
-@@ -5336,6 +5340,10 @@
+@@ -5345,6 +5349,10 @@
            LDLIBRARY='libpython$(VERSION).dll.a'
            DLLLIBRARY='libpython$(VERSION).dll'
            ;;
@@ -61,7 +61,7 @@ diff -urN a/configure b/configure
      SunOS*)
  	  LDLIBRARY='libpython$(VERSION).so'
  	  BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(VERSION)'
-@@ -5388,7 +5396,7 @@
+@@ -5397,7 +5405,7 @@
    esac
  else # shared is disabled
    case $ac_sys_system in
@@ -70,7 +70,7 @@ diff -urN a/configure b/configure
            BLDLIBRARY='$(LIBRARY)'
            LDLIBRARY='libpython$(VERSION).dll.a'
            ;;
-@@ -5865,6 +5873,7 @@
+@@ -5874,6 +5882,7 @@
  	case $ac_sys_system in
  		BeOS*) LN="ln -s";;
  		CYGWIN*) LN="ln -s";;
@@ -78,7 +78,7 @@ diff -urN a/configure b/configure
  		atheos*) LN="ln -s";;
  		*) LN=ln;;
  	esac
-@@ -8133,7 +8142,7 @@
+@@ -8122,7 +8131,7 @@
  	  		*)    SO=.sl;;
  		esac
  		;;
@@ -87,7 +87,7 @@ diff -urN a/configure b/configure
  	*)	   SO=.so;;
  	esac
  else
-@@ -8290,7 +8299,7 @@
+@@ -8279,7 +8288,7 @@
  	SCO_SV*)
  		LDSHARED='$(CC) -Wl,-G,-Bexport'
  		LDCXXSHARED='$(CXX) -Wl,-G,-Bexport';;
@@ -96,7 +96,7 @@ diff -urN a/configure b/configure
  		LDSHARED="gcc -shared -Wl,--enable-auto-image-base"
  		LDCXXSHARED="g++ -shared -Wl,--enable-auto-image-base";;
  	atheos*)
-@@ -8386,7 +8395,7 @@
+@@ -8375,7 +8384,7 @@
  			LINKFORSHARED="-Xlinker --export-dynamic"
  		    fi;;
  		  esac;;
@@ -105,7 +105,7 @@ diff -urN a/configure b/configure
  		if test $enable_shared = "no"
  		then
  			LINKFORSHARED='-Wl,--out-implib=$(LDLIBRARY)'
-@@ -8410,7 +8419,7 @@
+@@ -8399,7 +8408,7 @@
  if test ! "$LIBRARY" = "$LDLIBRARY"
  then
  	case $ac_sys_system in
@@ -114,7 +114,7 @@ diff -urN a/configure b/configure
  		# Cygwin needs CCSHARED when building extension DLLs
  		# but not when building the interpreter DLL.
  		CFLAGSFORSHARED='';;
-@@ -9621,7 +9630,7 @@
+@@ -9650,7 +9659,7 @@
  #define HAVE_PTHREAD_SIGMASK 1
  _ACEOF
   case $ac_sys_system in
@@ -123,10 +123,10 @@ diff -urN a/configure b/configure
  
  $as_echo "#define HAVE_BROKEN_PTHREAD_SIGMASK 1" >>confdefs.h
  
-diff -urN a/configure.ac b/configure.ac
---- a/configure.ac	2013-10-20 19:38:14.057108800 +0100
-+++ b/configure.ac	2013-10-20 19:38:53.356356600 +0100
-@@ -318,6 +318,9 @@
+diff -Naur a/configure.ac b/configure.ac
+--- a/configure.ac	2014-05-31 22:58:40.000000000 +0400
++++ b/configure.ac	2014-06-04 10:17:02.277400000 +0400
+@@ -319,6 +319,9 @@
  	*-*-cygwin*)
  		ac_sys_system=Cygwin
  		;;
@@ -136,7 +136,7 @@ diff -urN a/configure.ac b/configure.ac
  	*)
  		# for now, limit cross builds to known configurations
  		MACHDEP="unknown"
-@@ -342,6 +345,7 @@
+@@ -343,6 +346,7 @@
      case $MACHDEP in
  	linux*) MACHDEP="linux2";;
  	cygwin*) MACHDEP="cygwin";;
@@ -144,7 +144,7 @@ diff -urN a/configure.ac b/configure.ac
  	darwin*) MACHDEP="darwin";;
  	atheos*) MACHDEP="atheos";;
          irix646) MACHDEP="irix6";;
-@@ -361,7 +365,7 @@
+@@ -362,7 +366,7 @@
  			_host_cpu=$host_cpu
  		esac
  		;;
@@ -153,7 +153,7 @@ diff -urN a/configure.ac b/configure.ac
  		_host_cpu=
  		;;
  	*)
-@@ -820,7 +824,7 @@
+@@ -821,7 +825,7 @@
  if test -z "$enable_shared"
  then 
    case $ac_sys_system in
@@ -162,7 +162,7 @@ diff -urN a/configure.ac b/configure.ac
      enable_shared="yes";;
    *)
      enable_shared="no";;
-@@ -876,6 +880,10 @@
+@@ -877,6 +881,10 @@
            LDLIBRARY='libpython$(VERSION).dll.a'
            DLLLIBRARY='libpython$(VERSION).dll'
            ;;
@@ -173,7 +173,7 @@ diff -urN a/configure.ac b/configure.ac
      SunOS*)
  	  LDLIBRARY='libpython$(VERSION).so'
  	  BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(VERSION)'
-@@ -928,7 +936,7 @@
+@@ -929,7 +937,7 @@
    esac
  else # shared is disabled
    case $ac_sys_system in
@@ -182,7 +182,7 @@ diff -urN a/configure.ac b/configure.ac
            BLDLIBRARY='$(LIBRARY)'
            LDLIBRARY='libpython$(VERSION).dll.a'
            ;;
-@@ -1007,6 +1015,7 @@
+@@ -1008,6 +1016,7 @@
  	case $ac_sys_system in
  		BeOS*) LN="ln -s";;
  		CYGWIN*) LN="ln -s";;
@@ -190,7 +190,7 @@ diff -urN a/configure.ac b/configure.ac
  		atheos*) LN="ln -s";;
  		*) LN=ln;;
  	esac
-@@ -1917,7 +1926,7 @@
+@@ -1910,7 +1919,7 @@
  	  		*)    SO=.sl;;
  		esac
  		;;
@@ -199,7 +199,7 @@ diff -urN a/configure.ac b/configure.ac
  	*)	   SO=.so;;
  	esac
  else
-@@ -2068,7 +2077,7 @@
+@@ -2061,7 +2070,7 @@
  	SCO_SV*)
  		LDSHARED='$(CC) -Wl,-G,-Bexport'
  		LDCXXSHARED='$(CXX) -Wl,-G,-Bexport';;
@@ -208,7 +208,7 @@ diff -urN a/configure.ac b/configure.ac
  		LDSHARED="gcc -shared -Wl,--enable-auto-image-base"
  		LDCXXSHARED="g++ -shared -Wl,--enable-auto-image-base";;
  	atheos*)
-@@ -2160,7 +2169,7 @@
+@@ -2153,7 +2162,7 @@
  			LINKFORSHARED="-Xlinker --export-dynamic"
  		    fi;;
  		  esac;;
@@ -217,7 +217,7 @@ diff -urN a/configure.ac b/configure.ac
  		if test $enable_shared = "no"
  		then
  			LINKFORSHARED='-Wl,--out-implib=$(LDLIBRARY)'
-@@ -2182,7 +2191,7 @@
+@@ -2175,7 +2184,7 @@
  if test ! "$LIBRARY" = "$LDLIBRARY"
  then
  	case $ac_sys_system in
@@ -226,7 +226,7 @@ diff -urN a/configure.ac b/configure.ac
  		# Cygwin needs CCSHARED when building extension DLLs
  		# but not when building the interpreter DLL.
  		CFLAGSFORSHARED='';;
-@@ -2564,7 +2573,7 @@
+@@ -2585,7 +2594,7 @@
        fi
        AC_CHECK_FUNCS(pthread_sigmask,
          [case $ac_sys_system in
@@ -235,10 +235,11 @@ diff -urN a/configure.ac b/configure.ac
            AC_DEFINE(HAVE_BROKEN_PTHREAD_SIGMASK, 1,
              [Define if pthread_sigmask() does not work on your system.])
              ;;
-diff -urN a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py
---- a/Lib/ctypes/__init__.py	2013-10-20 19:38:17.309294800 +0100
-+++ b/Lib/ctypes/__init__.py	2013-10-20 19:38:53.393358700 +0100
-@@ -1,6 +1,6 @@
+diff -Naur a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py
+--- a/Lib/ctypes/__init__.py	2014-05-31 22:58:38.000000000 +0400
++++ b/Lib/ctypes/__init__.py	2014-06-04 10:17:02.293000000 +0400
+@@ -3,7 +3,7 @@
+ ######################################################################
  """create and manipulate C data types in Python"""
  
 -import os as _os, sys as _sys
@@ -246,7 +247,7 @@ diff -urN a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py
  
  __version__ = "1.1.0"
  
-@@ -435,8 +435,8 @@
+@@ -447,8 +447,8 @@
  
  if _os.name in ("nt", "ce"):
      pythonapi = PyDLL("python dll", None, _sys.dllhandle)
@@ -257,9 +258,9 @@ diff -urN a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py
  else:
      pythonapi = PyDLL(None)
  
-diff -urN a/Lib/ctypes/test/test_loading.py b/Lib/ctypes/test/test_loading.py
---- a/Lib/ctypes/test/test_loading.py	2013-10-20 19:38:17.127284400 +0100
-+++ b/Lib/ctypes/test/test_loading.py	2013-10-20 19:39:02.914903300 +0100
+diff -Naur a/Lib/ctypes/test/test_loading.py b/Lib/ctypes/test/test_loading.py
+--- a/Lib/ctypes/test/test_loading.py	2014-05-31 22:58:38.000000000 +0400
++++ b/Lib/ctypes/test/test_loading.py	2014-06-04 10:17:02.293000000 +0400
 @@ -11,6 +11,8 @@
      libc_name = "coredll"
  elif sys.platform == "cygwin":
@@ -269,9 +270,9 @@ diff -urN a/Lib/ctypes/test/test_loading.py b/Lib/ctypes/test/test_loading.py
  else:
      libc_name = find_library("c")
  
-diff -urN a/Lib/ctypes/util.py b/Lib/ctypes/util.py
---- a/Lib/ctypes/util.py	2013-10-20 19:38:17.305294600 +0100
-+++ b/Lib/ctypes/util.py	2013-10-20 19:39:02.922903800 +0100
+diff -Naur a/Lib/ctypes/util.py b/Lib/ctypes/util.py
+--- a/Lib/ctypes/util.py	2014-06-04 10:16:36.069400000 +0400
++++ b/Lib/ctypes/util.py	2014-06-04 10:17:02.293000000 +0400
 @@ -84,7 +84,7 @@
                  continue
          return None
@@ -294,9 +295,9 @@ diff -urN a/Lib/ctypes/util.py b/Lib/ctypes/util.py
          else:
              print cdll.LoadLibrary("libm.so")
              print cdll.LoadLibrary("libcrypt.so")
-diff -urN a/Lib/distutils/ccompiler.py b/Lib/distutils/ccompiler.py
---- a/Lib/distutils/ccompiler.py	2013-10-20 19:38:17.357297600 +0100
-+++ b/Lib/distutils/ccompiler.py	2013-10-20 19:39:02.941904900 +0100
+diff -Naur a/Lib/distutils/ccompiler.py b/Lib/distutils/ccompiler.py
+--- a/Lib/distutils/ccompiler.py	2014-05-31 22:58:38.000000000 +0400
++++ b/Lib/distutils/ccompiler.py	2014-06-04 10:17:02.308600000 +0400
 @@ -895,6 +895,7 @@
      # on a cygwin built python we can use gcc like an ordinary UNIXish
      # compiler
@@ -314,9 +315,9 @@ diff -urN a/Lib/distutils/ccompiler.py b/Lib/distutils/ccompiler.py
                     'mingw32': ('cygwinccompiler', 'Mingw32CCompiler',
                                 "Mingw32 port of GNU C Compiler for Win32"),
                     'bcpp':    ('bcppcompiler', 'BCPPCompiler',
-diff -urN a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
---- a/Lib/distutils/command/build_ext.py	2013-10-20 19:38:17.407300400 +0100
-+++ b/Lib/distutils/command/build_ext.py	2013-10-20 19:39:02.949905300 +0100
+diff -Naur a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
+--- a/Lib/distutils/command/build_ext.py	2014-05-31 22:58:38.000000000 +0400
++++ b/Lib/distutils/command/build_ext.py	2014-06-04 10:17:02.308600000 +0400
 @@ -221,7 +221,7 @@
  
          # for extensions under Cygwin and AtheOS Python's library directory must be
@@ -326,7 +327,7 @@ diff -urN a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext
              if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
                  # building third party extensions
                  self.library_dirs.append(os.path.join(sys.prefix, "lib",
-@@ -725,7 +725,7 @@
+@@ -723,7 +723,7 @@
              # don't extend ext.libraries, it may be shared with other
              # extensions, it is a reference to the original list
              return ext.libraries + [pythonlib]
@@ -335,9 +336,9 @@ diff -urN a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext
              template = "python%d.%d"
              pythonlib = (template %
                     (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
-diff -urN a/Lib/distutils/tests/support.py b/Lib/distutils/tests/support.py
---- a/Lib/distutils/tests/support.py	2013-10-20 19:38:17.654314600 +0100
-+++ b/Lib/distutils/tests/support.py	2013-10-20 19:39:02.955905700 +0100
+diff -Naur a/Lib/distutils/tests/support.py b/Lib/distutils/tests/support.py
+--- a/Lib/distutils/tests/support.py	2014-05-31 22:58:38.000000000 +0400
++++ b/Lib/distutils/tests/support.py	2014-06-04 10:17:02.308600000 +0400
 @@ -73,7 +73,7 @@
          super(TempdirManager, self).tearDown()
          while self.tempdirs:
@@ -347,9 +348,9 @@ diff -urN a/Lib/distutils/tests/support.py b/Lib/distutils/tests/support.py
  
      def mkdtemp(self):
          """Create a temporary directory that will be cleaned up.
-diff -urN a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py
---- a/Lib/distutils/unixccompiler.py	2013-10-20 19:38:17.770321200 +0100
-+++ b/Lib/distutils/unixccompiler.py	2013-10-20 19:39:02.960906000 +0100
+diff -Naur a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py
+--- a/Lib/distutils/unixccompiler.py	2014-06-04 10:16:52.636600000 +0400
++++ b/Lib/distutils/unixccompiler.py	2014-06-04 10:17:02.308600000 +0400
 @@ -80,7 +80,7 @@
      shared_lib_extension = ".so"
      dylib_lib_extension = ".dylib"
@@ -359,9 +360,9 @@ diff -urN a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py
          exe_extension = ".exe"
          dylib_lib_extension = ".dll.a"
  
-diff -urN a/Lib/distutils/util.py b/Lib/distutils/util.py
---- a/Lib/distutils/util.py	2013-10-20 19:38:17.771321300 +0100
-+++ b/Lib/distutils/util.py	2013-10-20 19:39:02.969906500 +0100
+diff -Naur a/Lib/distutils/util.py b/Lib/distutils/util.py
+--- a/Lib/distutils/util.py	2014-05-31 22:58:38.000000000 +0400
++++ b/Lib/distutils/util.py	2014-06-04 10:17:02.308600000 +0400
 @@ -96,6 +96,12 @@
          m = rel_re.match(release)
          if m:
@@ -375,9 +376,9 @@ diff -urN a/Lib/distutils/util.py b/Lib/distutils/util.py
      elif osname[:6] == "darwin":
          import _osx_support, distutils.sysconfig
          osname, release, machine = _osx_support.get_platform_osx(
-diff -urN a/Lib/lib-tk/test/test_tkinter/test_loadtk.py b/Lib/lib-tk/test/test_tkinter/test_loadtk.py
---- a/Lib/lib-tk/test/test_tkinter/test_loadtk.py	2013-10-20 19:38:19.047394200 +0100
-+++ b/Lib/lib-tk/test/test_tkinter/test_loadtk.py	2013-10-20 19:39:02.976906900 +0100
+diff -Naur a/Lib/lib-tk/test/test_tkinter/test_loadtk.py b/Lib/lib-tk/test/test_tkinter/test_loadtk.py
+--- a/Lib/lib-tk/test/test_tkinter/test_loadtk.py	2014-05-31 22:58:39.000000000 +0400
++++ b/Lib/lib-tk/test/test_tkinter/test_loadtk.py	2014-06-04 10:17:02.324200000 +0400
 @@ -18,7 +18,7 @@
  
      def testLoadTkFailure(self):
@@ -387,9 +388,9 @@ diff -urN a/Lib/lib-tk/test/test_tkinter/test_loadtk.py b/Lib/lib-tk/test/test_t
              # no failure possible on windows?
  
              # XXX Maybe on tk older than 8.4.13 it would be possible,
-diff -urN a/Lib/sysconfig.py b/Lib/sysconfig.py
---- a/Lib/sysconfig.py	2013-10-20 19:38:20.145457100 +0100
-+++ b/Lib/sysconfig.py	2013-10-20 19:39:02.987907500 +0100
+diff -Naur a/Lib/sysconfig.py b/Lib/sysconfig.py
+--- a/Lib/sysconfig.py	2014-05-31 22:58:39.000000000 +0400
++++ b/Lib/sysconfig.py	2014-06-04 10:17:02.324200000 +0400
 @@ -598,6 +598,12 @@
          m = rel_re.match(release)
          if m:
@@ -403,21 +404,21 @@ diff -urN a/Lib/sysconfig.py b/Lib/sysconfig.py
      elif osname[:6] == "darwin":
          import _osx_support
          osname, release, machine = _osx_support.get_platform_osx(
-diff -urN a/Lib/tempfile.py b/Lib/tempfile.py
---- a/Lib/tempfile.py	2013-10-20 19:38:20.147457200 +0100
-+++ b/Lib/tempfile.py	2013-10-20 19:39:03.003908400 +0100
-@@ -459,7 +459,7 @@
-     file = _os.fdopen(fd, mode, bufsize)
-     return _TemporaryFileWrapper(file, name, delete)
+diff -Naur a/Lib/tempfile.py b/Lib/tempfile.py
+--- a/Lib/tempfile.py	2014-05-31 22:58:39.000000000 +0400
++++ b/Lib/tempfile.py	2014-06-04 10:17:02.324200000 +0400
+@@ -467,7 +467,7 @@
+         _os.close(fd)
+         raise
  
 -if _os.name != 'posix' or _os.sys.platform == 'cygwin':
 +if _os.name != 'posix' or _os.sys.platform == 'cygwin' or _os.sys.platform == 'msys':
      # On non-POSIX and Cygwin systems, assume that we cannot unlink a file
      # while it is open.
      TemporaryFile = NamedTemporaryFile
-diff -urN a/Lib/test/regrtest.py b/Lib/test/regrtest.py
---- a/Lib/test/regrtest.py	2013-10-20 19:38:20.303466100 +0100
-+++ b/Lib/test/regrtest.py	2013-10-20 19:39:03.008908700 +0100
+diff -Naur a/Lib/test/regrtest.py b/Lib/test/regrtest.py
+--- a/Lib/test/regrtest.py	2014-05-31 22:58:39.000000000 +0400
++++ b/Lib/test/regrtest.py	2014-06-04 10:17:02.324200000 +0400
 @@ -1357,6 +1357,20 @@
          test_ossaudiodev
          test_socketserver
@@ -439,9 +440,9 @@ diff -urN a/Lib/test/regrtest.py b/Lib/test/regrtest.py
      'os2emx':
          """
          test_audioop
-diff -urN a/Lib/test/test_curses.py b/Lib/test/test_curses.py
---- a/Lib/test/test_curses.py	2013-10-20 19:38:20.351468800 +0100
-+++ b/Lib/test/test_curses.py	2013-10-20 19:39:03.010908800 +0100
+diff -Naur a/Lib/test/test_curses.py b/Lib/test/test_curses.py
+--- a/Lib/test/test_curses.py	2014-05-31 22:58:39.000000000 +0400
++++ b/Lib/test/test_curses.py	2014-06-04 10:17:02.324200000 +0400
 @@ -27,7 +27,7 @@
  if not term or term == 'unknown':
      raise unittest.SkipTest, "$TERM=%r, calling initscr() may cause exit" % term
@@ -451,10 +452,10 @@ diff -urN a/Lib/test/test_curses.py b/Lib/test/test_curses.py
      raise unittest.SkipTest("cygwin's curses mostly just hangs")
  
  def window_funcs(stdscr):
-diff -urN a/Lib/test/test_dl.py b/Lib/test/test_dl.py
---- a/Lib/test/test_dl.py	2013-10-20 19:38:20.358469200 +0100
-+++ b/Lib/test/test_dl.py	2013-10-20 19:39:03.015909100 +0100
-@@ -10,6 +10,7 @@
+diff -Naur a/Lib/test/test_dl.py b/Lib/test/test_dl.py
+--- a/Lib/test/test_dl.py	2014-05-31 22:58:39.000000000 +0400
++++ b/Lib/test/test_dl.py	2014-06-04 10:17:02.339800000 +0400
+@@ -9,6 +9,7 @@
      ('/usr/lib/libc.so', 'getpid'),
      ('/lib/libc.so.6', 'getpid'),
      ('/usr/bin/cygwin1.dll', 'getpid'),
@@ -462,10 +463,10 @@ diff -urN a/Lib/test/test_dl.py b/Lib/test/test_dl.py
      ('/usr/lib/libc.dylib', 'getpid'),
      ]
  
-diff -urN a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py
---- a/Lib/test/test_mailbox.py	2013-10-20 19:38:20.402471800 +0100
-+++ b/Lib/test/test_mailbox.py	2013-10-20 19:39:03.018909300 +0100
-@@ -501,7 +501,7 @@
+diff -Naur a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py
+--- a/Lib/test/test_mailbox.py	2014-05-31 22:58:39.000000000 +0400
++++ b/Lib/test/test_mailbox.py	2014-06-04 10:17:02.339800000 +0400
+@@ -500,7 +500,7 @@
  
      def setUp(self):
          TestMailbox.setUp(self)
@@ -474,10 +475,10 @@ diff -urN a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py
              self._box.colon = '!'
  
      def test_add_MM(self):
-diff -urN a/Lib/test/test_netrc.py b/Lib/test/test_netrc.py
---- a/Lib/test/test_netrc.py	2013-10-20 19:38:20.411472300 +0100
-+++ b/Lib/test/test_netrc.py	2013-10-20 19:39:03.023909600 +0100
-@@ -11,7 +11,7 @@
+diff -Naur a/Lib/test/test_netrc.py b/Lib/test/test_netrc.py
+--- a/Lib/test/test_netrc.py	2014-05-31 22:58:39.000000000 +0400
++++ b/Lib/test/test_netrc.py	2014-06-04 10:17:02.339800000 +0400
+@@ -8,7 +8,7 @@
      def make_nrc(self, test_data):
          test_data = textwrap.dedent(test_data)
          mode = 'w'
@@ -486,9 +487,9 @@ diff -urN a/Lib/test/test_netrc.py b/Lib/test/test_netrc.py
              mode += 't'
          with open(temp_filename, mode) as fp:
              fp.write(test_data)
-diff -urN a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
---- a/Lib/test/test_shutil.py	2013-10-20 19:38:20.442474000 +0100
-+++ b/Lib/test/test_shutil.py	2013-10-20 19:39:03.026909700 +0100
+diff -Naur a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
+--- a/Lib/test/test_shutil.py	2014-05-31 22:58:39.000000000 +0400
++++ b/Lib/test/test_shutil.py	2014-06-04 10:17:02.355400000 +0400
 @@ -49,7 +49,7 @@
          super(TestShutil, self).tearDown()
          while self.tempdirs:
@@ -498,18 +499,18 @@ diff -urN a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
  
      def write_file(self, path, content='xxx'):
          """Writes a file in the given path.
-@@ -80,7 +80,7 @@
+@@ -79,7 +79,7 @@
+         self.assertRaises(OSError, shutil.rmtree, filename)
  
-     # See bug #1071513 for why we don't run this on cygwin
-     # and bug #1076467 for why we don't run this as root.
--    if (hasattr(os, 'chmod') and sys.platform[:6] != 'cygwin'
-+    if (hasattr(os, 'chmod') and sys.platform[:6] != 'cygwin' and sys.platform[:4] != 'msys'
-         and not (hasattr(os, 'geteuid') and os.geteuid() == 0)):
-         def test_on_error(self):
-             self.errorState = 0
-diff -urN a/Modules/_ctypes/libffi/acinclude.m4 b/Modules/_ctypes/libffi/acinclude.m4
---- a/Modules/_ctypes/libffi/acinclude.m4	2013-10-20 19:38:20.797494300 +0100
-+++ b/Modules/_ctypes/libffi/acinclude.m4	2013-10-20 19:39:03.030910000 +0100
+     @unittest.skipUnless(hasattr(os, 'chmod'), 'requires os.chmod()')
+-    @unittest.skipIf(sys.platform[:6] == 'cygwin',
++    @unittest.skipIf(sys.platform[:6] == 'cygwin' or sys.platform[:4] == 'msys',
+                      "This test can't be run on Cygwin (issue #1071513).")
+     @unittest.skipIf(hasattr(os, 'geteuid') and os.geteuid() == 0,
+                      "This test can't be run reliably as root (issue #1076467).")
+diff -Naur a/Modules/_ctypes/libffi/acinclude.m4 b/Modules/_ctypes/libffi/acinclude.m4
+--- a/Modules/_ctypes/libffi/acinclude.m4	2014-05-31 22:58:40.000000000 +0400
++++ b/Modules/_ctypes/libffi/acinclude.m4	2014-06-04 10:17:02.355400000 +0400
 @@ -37,7 +37,7 @@
     # Systems known to be in this category are Windows (all variants),
     # VMS, and Darwin.
@@ -528,9 +529,9 @@ diff -urN a/Modules/_ctypes/libffi/acinclude.m4 b/Modules/_ctypes/libffi/acinclu
  	ac_cv_func_mmap_anon=no ;;
       *)
  	ac_cv_func_mmap_anon=yes;;
-diff -urN a/Modules/_ctypes/libffi/aclocal.m4 b/Modules/_ctypes/libffi/aclocal.m4
---- a/Modules/_ctypes/libffi/aclocal.m4	2013-10-20 19:38:20.798494400 +0100
-+++ b/Modules/_ctypes/libffi/aclocal.m4	2013-10-20 19:39:03.033910100 +0100
+diff -Naur a/Modules/_ctypes/libffi/aclocal.m4 b/Modules/_ctypes/libffi/aclocal.m4
+--- a/Modules/_ctypes/libffi/aclocal.m4	2014-05-31 22:58:40.000000000 +0400
++++ b/Modules/_ctypes/libffi/aclocal.m4	2014-06-04 10:17:02.355400000 +0400
 @@ -724,7 +724,7 @@
  beos*)
    LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}load_add_on.la"
@@ -540,9 +541,9 @@ diff -urN a/Modules/_ctypes/libffi/aclocal.m4 b/Modules/_ctypes/libffi/aclocal.m
    AC_CHECK_DECLS([cygwin_conv_path], [], [], [[#include <sys/cygwin.h>]])
    LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}loadlibrary.la"
    ;;
-diff -urN a/Modules/_ctypes/libffi/config.guess b/Modules/_ctypes/libffi/config.guess
---- a/Modules/_ctypes/libffi/config.guess	2013-10-20 19:38:20.801494600 +0100
-+++ b/Modules/_ctypes/libffi/config.guess	2013-10-20 19:39:03.037910400 +0100
+diff -Naur a/Modules/_ctypes/libffi/config.guess b/Modules/_ctypes/libffi/config.guess
+--- a/Modules/_ctypes/libffi/config.guess	2014-05-31 22:58:40.000000000 +0400
++++ b/Modules/_ctypes/libffi/config.guess	2014-06-04 10:17:02.355400000 +0400
 @@ -849,6 +849,9 @@
      amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
  	echo x86_64-unknown-cygwin
@@ -553,9 +554,9 @@ diff -urN a/Modules/_ctypes/libffi/config.guess b/Modules/_ctypes/libffi/config.
      p*:CYGWIN*:*)
  	echo powerpcle-unknown-cygwin
  	exit ;;
-diff -urN a/Modules/_ctypes/libffi/configure b/Modules/_ctypes/libffi/configure
---- a/Modules/_ctypes/libffi/configure	2013-10-20 19:38:20.802494600 +0100
-+++ b/Modules/_ctypes/libffi/configure	2013-10-20 19:39:03.051911200 +0100
+diff -Naur a/Modules/_ctypes/libffi/configure b/Modules/_ctypes/libffi/configure
+--- a/Modules/_ctypes/libffi/configure	2014-05-31 22:58:40.000000000 +0400
++++ b/Modules/_ctypes/libffi/configure	2014-06-04 10:17:02.371000000 +0400
 @@ -5291,7 +5291,7 @@
      lt_cv_sys_max_cmd_len=-1;
      ;;
@@ -746,9 +747,9 @@ diff -urN a/Modules/_ctypes/libffi/configure b/Modules/_ctypes/libffi/configure
  	TARGET=X86_WIN64; TARGETDIR=x86
  	# All mingw/cygwin/win32 builds require -no-undefined for sharedlib.
  	# We must also check with_cross_host to decide if this is a native
-diff -urN a/Modules/_ctypes/libffi/configure.ac b/Modules/_ctypes/libffi/configure.ac
---- a/Modules/_ctypes/libffi/configure.ac	2013-10-20 19:38:20.803494700 +0100
-+++ b/Modules/_ctypes/libffi/configure.ac	2013-10-20 19:39:03.067912100 +0100
+diff -Naur a/Modules/_ctypes/libffi/configure.ac b/Modules/_ctypes/libffi/configure.ac
+--- a/Modules/_ctypes/libffi/configure.ac	2014-05-31 22:58:40.000000000 +0400
++++ b/Modules/_ctypes/libffi/configure.ac	2014-06-04 10:17:02.386600000 +0400
 @@ -125,7 +125,7 @@
    i?86-*-freebsd* | i?86-*-openbsd*)
  	TARGET=X86_FREEBSD; TARGETDIR=x86
@@ -767,9 +768,9 @@ diff -urN a/Modules/_ctypes/libffi/configure.ac b/Modules/_ctypes/libffi/configu
  	TARGET=X86_WIN64; TARGETDIR=x86
  	# All mingw/cygwin/win32 builds require -no-undefined for sharedlib.
  	# We must also check with_cross_host to decide if this is a native
-diff -urN a/Modules/_ctypes/libffi/ltmain.sh b/Modules/_ctypes/libffi/ltmain.sh
---- a/Modules/_ctypes/libffi/ltmain.sh	2013-10-20 19:38:20.813495300 +0100
-+++ b/Modules/_ctypes/libffi/ltmain.sh	2013-10-20 19:39:03.075912500 +0100
+diff -Naur a/Modules/_ctypes/libffi/ltmain.sh b/Modules/_ctypes/libffi/ltmain.sh
+--- a/Modules/_ctypes/libffi/ltmain.sh	2014-05-31 22:58:40.000000000 +0400
++++ b/Modules/_ctypes/libffi/ltmain.sh	2014-06-04 10:17:02.402200000 +0400
 @@ -1180,7 +1180,7 @@
    test "$opt_debug" = : || func_append preserve_args " --debug"
  
@@ -994,9 +995,9 @@ diff -urN a/Modules/_ctypes/libffi/ltmain.sh b/Modules/_ctypes/libffi/ltmain.sh
  	      # If a -bindir argument was supplied, place the dll there.
  	      if test "x$bindir" != x ;
  	      then
-diff -urN a/Modules/_ctypes/libffi/m4/libtool.m4 b/Modules/_ctypes/libffi/m4/libtool.m4
---- a/Modules/_ctypes/libffi/m4/libtool.m4	2013-10-20 19:38:20.821495700 +0100
-+++ b/Modules/_ctypes/libffi/m4/libtool.m4	2013-10-20 19:39:03.089913300 +0100
+diff -Naur a/Modules/_ctypes/libffi/m4/libtool.m4 b/Modules/_ctypes/libffi/m4/libtool.m4
+--- a/Modules/_ctypes/libffi/m4/libtool.m4	2014-05-31 22:58:40.000000000 +0400
++++ b/Modules/_ctypes/libffi/m4/libtool.m4	2014-06-04 10:17:02.417800000 +0400
 @@ -1623,7 +1623,7 @@
      lt_cv_sys_max_cmd_len=-1;
      ;;
@@ -1178,9 +1179,9 @@ diff -urN a/Modules/_ctypes/libffi/m4/libtool.m4 b/Modules/_ctypes/libffi/m4/lib
          lt_cv_to_host_file_cmd=func_convert_file_noop
          ;;
        * ) # otherwise, assume *nix
-diff -urN a/Modules/_ctypes/libffi/m4/ltoptions.m4 b/Modules/_ctypes/libffi/m4/ltoptions.m4
---- a/Modules/_ctypes/libffi/m4/ltoptions.m4	2013-10-20 19:38:20.821495700 +0100
-+++ b/Modules/_ctypes/libffi/m4/ltoptions.m4	2013-10-20 19:39:03.149916800 +0100
+diff -Naur a/Modules/_ctypes/libffi/m4/ltoptions.m4 b/Modules/_ctypes/libffi/m4/ltoptions.m4
+--- a/Modules/_ctypes/libffi/m4/ltoptions.m4	2014-05-31 22:58:40.000000000 +0400
++++ b/Modules/_ctypes/libffi/m4/ltoptions.m4	2014-06-04 10:17:02.449000000 +0400
 @@ -126,7 +126,7 @@
  [enable_win32_dll=yes
  
@@ -1190,9 +1191,9 @@ diff -urN a/Modules/_ctypes/libffi/m4/ltoptions.m4 b/Modules/_ctypes/libffi/m4/l
    AC_CHECK_TOOL(AS, as, false)
    AC_CHECK_TOOL(DLLTOOL, dlltool, false)
    AC_CHECK_TOOL(OBJDUMP, objdump, false)
-diff -urN a/Modules/_ctypes/libffi/testsuite/lib/target-libpath.exp b/Modules/_ctypes/libffi/testsuite/lib/target-libpath.exp
---- a/Modules/_ctypes/libffi/testsuite/lib/target-libpath.exp	2013-10-20 19:38:20.877498900 +0100
-+++ b/Modules/_ctypes/libffi/testsuite/lib/target-libpath.exp	2013-10-20 19:39:03.179918500 +0100
+diff -Naur a/Modules/_ctypes/libffi/testsuite/lib/target-libpath.exp b/Modules/_ctypes/libffi/testsuite/lib/target-libpath.exp
+--- a/Modules/_ctypes/libffi/testsuite/lib/target-libpath.exp	2014-05-31 22:58:40.000000000 +0400
++++ b/Modules/_ctypes/libffi/testsuite/lib/target-libpath.exp	2014-06-04 10:17:02.449000000 +0400
 @@ -175,7 +175,7 @@
    } else {
      setenv DYLD_LIBRARY_PATH "$ld_library_path"
@@ -1211,9 +1212,9 @@ diff -urN a/Modules/_ctypes/libffi/testsuite/lib/target-libpath.exp b/Modules/_c
  	set shlib_ext "dll"
      } elseif { [ istarget hppa*-*-hpux* ] } {
  	set shlib_ext "sl"
-diff -urN a/Modules/_ctypes/libffi/testsuite/libffi.call/closure_stdcall.c b/Modules/_ctypes/libffi/testsuite/libffi.call/closure_stdcall.c
---- a/Modules/_ctypes/libffi/testsuite/libffi.call/closure_stdcall.c	2013-10-20 19:38:20.885499400 +0100
-+++ b/Modules/_ctypes/libffi/testsuite/libffi.call/closure_stdcall.c	2013-10-20 19:39:03.223921000 +0100
+diff -Naur a/Modules/_ctypes/libffi/testsuite/libffi.call/closure_stdcall.c b/Modules/_ctypes/libffi/testsuite/libffi.call/closure_stdcall.c
+--- a/Modules/_ctypes/libffi/testsuite/libffi.call/closure_stdcall.c	2014-05-31 22:58:40.000000000 +0400
++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/closure_stdcall.c	2014-06-04 10:17:02.449000000 +0400
 @@ -4,7 +4,7 @@
     PR:		none.
     Originator:	<twalljava@dev.java.net> */
@@ -1223,9 +1224,9 @@ diff -urN a/Modules/_ctypes/libffi/testsuite/libffi.call/closure_stdcall.c b/Mod
  #include "ffitest.h"
  
  static void
-diff -urN a/Modules/_ctypes/libffi/testsuite/libffi.call/closure_thiscall.c b/Modules/_ctypes/libffi/testsuite/libffi.call/closure_thiscall.c
---- a/Modules/_ctypes/libffi/testsuite/libffi.call/closure_thiscall.c	2013-10-20 19:38:20.886499400 +0100
-+++ b/Modules/_ctypes/libffi/testsuite/libffi.call/closure_thiscall.c	2013-10-20 19:39:03.256922900 +0100
+diff -Naur a/Modules/_ctypes/libffi/testsuite/libffi.call/closure_thiscall.c b/Modules/_ctypes/libffi/testsuite/libffi.call/closure_thiscall.c
+--- a/Modules/_ctypes/libffi/testsuite/libffi.call/closure_thiscall.c	2014-05-31 22:58:40.000000000 +0400
++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/closure_thiscall.c	2014-06-04 10:17:02.449000000 +0400
 @@ -4,7 +4,7 @@
     PR:		none.
     Originator:	<ktietz@redhat.com> */
@@ -1235,9 +1236,9 @@ diff -urN a/Modules/_ctypes/libffi/testsuite/libffi.call/closure_thiscall.c b/Mo
  #include "ffitest.h"
  
  static void
-diff -urN a/Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_longdouble_split.c b/Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_longdouble_split.c
---- a/Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_longdouble_split.c	2013-10-20 19:38:20.905500500 +0100
-+++ b/Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_longdouble_split.c	2013-10-20 19:39:03.299925300 +0100
+diff -Naur a/Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_longdouble_split.c b/Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_longdouble_split.c
+--- a/Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_longdouble_split.c	2014-05-31 22:58:40.000000000 +0400
++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_longdouble_split.c	2014-06-04 10:17:02.449000000 +0400
 @@ -4,10 +4,10 @@
     PR:		none.
     Originator:	<hos@tamanegi.org> 20031203	 */
@@ -1251,9 +1252,9 @@ diff -urN a/Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_longdouble_sp
  
  #include "ffitest.h"
  
-diff -urN a/Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_longdouble_split2.c b/Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_longdouble_split2.c
---- a/Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_longdouble_split2.c	2013-10-20 19:38:20.905500500 +0100
-+++ b/Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_longdouble_split2.c	2013-10-20 19:39:03.328927000 +0100
+diff -Naur a/Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_longdouble_split2.c b/Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_longdouble_split2.c
+--- a/Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_longdouble_split2.c	2014-05-31 22:58:40.000000000 +0400
++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_longdouble_split2.c	2014-06-04 10:17:02.464600000 +0400
 @@ -5,10 +5,10 @@
  	Originator:		Blake Chaffin	6/18/2007
  */
@@ -1267,9 +1268,9 @@ diff -urN a/Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_longdouble_sp
  
  #include "ffitest.h"
  
-diff -urN a/Modules/_ctypes/libffi/testsuite/libffi.call/cls_longdouble.c b/Modules/_ctypes/libffi/testsuite/libffi.call/cls_longdouble.c
---- a/Modules/_ctypes/libffi/testsuite/libffi.call/cls_longdouble.c	2013-10-20 19:38:20.911500900 +0100
-+++ b/Modules/_ctypes/libffi/testsuite/libffi.call/cls_longdouble.c	2013-10-20 19:39:03.357928700 +0100
+diff -Naur a/Modules/_ctypes/libffi/testsuite/libffi.call/cls_longdouble.c b/Modules/_ctypes/libffi/testsuite/libffi.call/cls_longdouble.c
+--- a/Modules/_ctypes/libffi/testsuite/libffi.call/cls_longdouble.c	2014-05-31 22:58:40.000000000 +0400
++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/cls_longdouble.c	2014-06-04 10:17:02.464600000 +0400
 @@ -4,12 +4,12 @@
     PR:			none.
     Originator:	Blake Chaffin	*/
@@ -1285,9 +1286,9 @@ diff -urN a/Modules/_ctypes/libffi/testsuite/libffi.call/cls_longdouble.c b/Modu
  
  #include "ffitest.h"
  
-diff -urN a/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis1_win32.c b/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis1_win32.c
---- a/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis1_win32.c	2013-10-20 19:38:20.926501700 +0100
-+++ b/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis1_win32.c	2013-10-20 19:39:03.383930200 +0100
+diff -Naur a/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis1_win32.c b/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis1_win32.c
+--- a/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis1_win32.c	2014-05-31 22:58:40.000000000 +0400
++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis1_win32.c	2014-06-04 10:17:02.464600000 +0400
 @@ -4,7 +4,7 @@
     PR:		none.
     Originator:	From the original ffitest.c  */
@@ -1297,9 +1298,9 @@ diff -urN a/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis1_win32.c b/Mod
  
  #include "ffitest.h"
  
-diff -urN a/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis2_win32.c b/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis2_win32.c
---- a/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis2_win32.c	2013-10-20 19:38:20.927501800 +0100
-+++ b/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis2_win32.c	2013-10-20 19:39:03.432933000 +0100
+diff -Naur a/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis2_win32.c b/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis2_win32.c
+--- a/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis2_win32.c	2014-05-31 22:58:40.000000000 +0400
++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis2_win32.c	2014-06-04 10:17:02.464600000 +0400
 @@ -4,7 +4,7 @@
     PR:		none.
     Originator:	From the original ffitest.c  */
@@ -1309,9 +1310,9 @@ diff -urN a/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis2_win32.c b/Mod
  
  #include "ffitest.h"
  
-diff -urN a/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis3_win32.c b/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis3_win32.c
---- a/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis3_win32.c	2013-10-20 19:38:20.927501800 +0100
-+++ b/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis3_win32.c	2013-10-20 19:39:03.476935500 +0100
+diff -Naur a/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis3_win32.c b/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis3_win32.c
+--- a/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis3_win32.c	2014-05-31 22:58:40.000000000 +0400
++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis3_win32.c	2014-06-04 10:17:02.464600000 +0400
 @@ -4,7 +4,7 @@
     PR:		none.
     Originator:	From the original ffitest.c  */
@@ -1321,9 +1322,9 @@ diff -urN a/Modules/_ctypes/libffi/testsuite/libffi.call/fastthis3_win32.c b/Mod
  
  #include "ffitest.h"
  
-diff -urN a/Modules/_ctypes/libffi/testsuite/libffi.call/float2.c b/Modules/_ctypes/libffi/testsuite/libffi.call/float2.c
---- a/Modules/_ctypes/libffi/testsuite/libffi.call/float2.c	2013-10-20 19:38:20.929501900 +0100
-+++ b/Modules/_ctypes/libffi/testsuite/libffi.call/float2.c	2013-10-20 19:39:03.505937100 +0100
+diff -Naur a/Modules/_ctypes/libffi/testsuite/libffi.call/float2.c b/Modules/_ctypes/libffi/testsuite/libffi.call/float2.c
+--- a/Modules/_ctypes/libffi/testsuite/libffi.call/float2.c	2014-05-31 22:58:40.000000000 +0400
++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/float2.c	2014-06-04 10:17:02.464600000 +0400
 @@ -4,8 +4,8 @@
     PR:		none.
     Originator:	From the original ffitest.c  */
@@ -1335,9 +1336,9 @@ diff -urN a/Modules/_ctypes/libffi/testsuite/libffi.call/float2.c b/Modules/_cty
  
  #include "ffitest.h"
  #include "float.h"
-diff -urN a/Modules/_ctypes/libffi/testsuite/libffi.call/huge_struct.c b/Modules/_ctypes/libffi/testsuite/libffi.call/huge_struct.c
---- a/Modules/_ctypes/libffi/testsuite/libffi.call/huge_struct.c	2013-10-20 19:38:20.933502100 +0100
-+++ b/Modules/_ctypes/libffi/testsuite/libffi.call/huge_struct.c	2013-10-20 19:39:03.539939100 +0100
+diff -Naur a/Modules/_ctypes/libffi/testsuite/libffi.call/huge_struct.c b/Modules/_ctypes/libffi/testsuite/libffi.call/huge_struct.c
+--- a/Modules/_ctypes/libffi/testsuite/libffi.call/huge_struct.c	2014-05-31 22:58:40.000000000 +0400
++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/huge_struct.c	2014-06-04 10:17:02.480200000 +0400
 @@ -5,11 +5,11 @@
  	Originator:		Blake Chaffin	6/18/2007
  */
@@ -1352,9 +1353,9 @@ diff -urN a/Modules/_ctypes/libffi/testsuite/libffi.call/huge_struct.c b/Modules
  
  #include "ffitest.h"
  
-diff -urN a/Modules/_ctypes/libffi/testsuite/libffi.call/many_win32.c b/Modules/_ctypes/libffi/testsuite/libffi.call/many_win32.c
---- a/Modules/_ctypes/libffi/testsuite/libffi.call/many_win32.c	2013-10-20 19:38:20.935502200 +0100
-+++ b/Modules/_ctypes/libffi/testsuite/libffi.call/many_win32.c	2013-10-20 19:39:03.569940800 +0100
+diff -Naur a/Modules/_ctypes/libffi/testsuite/libffi.call/many_win32.c b/Modules/_ctypes/libffi/testsuite/libffi.call/many_win32.c
+--- a/Modules/_ctypes/libffi/testsuite/libffi.call/many_win32.c	2014-05-31 22:58:40.000000000 +0400
++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/many_win32.c	2014-06-04 10:17:02.480200000 +0400
 @@ -4,7 +4,7 @@
     PR:		none.
     Originator:	From the original ffitest.c  */
@@ -1364,9 +1365,9 @@ diff -urN a/Modules/_ctypes/libffi/testsuite/libffi.call/many_win32.c b/Modules/
  
  #include "ffitest.h"
  #include <float.h>
-diff -urN a/Modules/_ctypes/libffi/testsuite/libffi.call/return_ldl.c b/Modules/_ctypes/libffi/testsuite/libffi.call/return_ldl.c
---- a/Modules/_ctypes/libffi/testsuite/libffi.call/return_ldl.c	2013-10-20 19:38:20.944502800 +0100
-+++ b/Modules/_ctypes/libffi/testsuite/libffi.call/return_ldl.c	2013-10-20 19:39:03.580941400 +0100
+diff -Naur a/Modules/_ctypes/libffi/testsuite/libffi.call/return_ldl.c b/Modules/_ctypes/libffi/testsuite/libffi.call/return_ldl.c
+--- a/Modules/_ctypes/libffi/testsuite/libffi.call/return_ldl.c	2014-05-31 22:58:40.000000000 +0400
++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/return_ldl.c	2014-06-04 10:17:02.480200000 +0400
 @@ -4,7 +4,7 @@
     PR:		none.
     Originator:	<andreast@gcc.gnu.org> 20071113  */
@@ -1376,9 +1377,9 @@ diff -urN a/Modules/_ctypes/libffi/testsuite/libffi.call/return_ldl.c b/Modules/
  #include "ffitest.h"
  
  static long double return_ldl(long double ldl)
-diff -urN a/Modules/_ctypes/libffi/testsuite/libffi.call/strlen_win32.c b/Modules/_ctypes/libffi/testsuite/libffi.call/strlen_win32.c
---- a/Modules/_ctypes/libffi/testsuite/libffi.call/strlen_win32.c	2013-10-20 19:38:20.950503100 +0100
-+++ b/Modules/_ctypes/libffi/testsuite/libffi.call/strlen_win32.c	2013-10-20 19:39:03.626944000 +0100
+diff -Naur a/Modules/_ctypes/libffi/testsuite/libffi.call/strlen_win32.c b/Modules/_ctypes/libffi/testsuite/libffi.call/strlen_win32.c
+--- a/Modules/_ctypes/libffi/testsuite/libffi.call/strlen_win32.c	2014-05-31 22:58:40.000000000 +0400
++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/strlen_win32.c	2014-06-04 10:17:02.480200000 +0400
 @@ -4,7 +4,7 @@
     PR:		none.
     Originator:	From the original ffitest.c  */
@@ -1388,9 +1389,9 @@ diff -urN a/Modules/_ctypes/libffi/testsuite/libffi.call/strlen_win32.c b/Module
  
  #include "ffitest.h"
  
-diff -urN a/Modules/_ctypes/libffi/testsuite/libffi.call/strlen2_win32.c b/Modules/_ctypes/libffi/testsuite/libffi.call/strlen2_win32.c
---- a/Modules/_ctypes/libffi/testsuite/libffi.call/strlen2_win32.c	2013-10-20 19:38:20.949503000 +0100
-+++ b/Modules/_ctypes/libffi/testsuite/libffi.call/strlen2_win32.c	2013-10-20 19:39:03.649945400 +0100
+diff -Naur a/Modules/_ctypes/libffi/testsuite/libffi.call/strlen2_win32.c b/Modules/_ctypes/libffi/testsuite/libffi.call/strlen2_win32.c
+--- a/Modules/_ctypes/libffi/testsuite/libffi.call/strlen2_win32.c	2014-05-31 22:58:40.000000000 +0400
++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/strlen2_win32.c	2014-06-04 10:17:02.480200000 +0400
 @@ -4,7 +4,7 @@
     PR:		none.
     Originator:	From the original ffitest.c  */
@@ -1400,9 +1401,9 @@ diff -urN a/Modules/_ctypes/libffi/testsuite/libffi.call/strlen2_win32.c b/Modul
  
  #include "ffitest.h"
  
-diff -urN a/Modules/_ctypes/libffi/testsuite/libffi.call/struct1_win32.c b/Modules/_ctypes/libffi/testsuite/libffi.call/struct1_win32.c
---- a/Modules/_ctypes/libffi/testsuite/libffi.call/struct1_win32.c	2013-10-20 19:38:20.951503200 +0100
-+++ b/Modules/_ctypes/libffi/testsuite/libffi.call/struct1_win32.c	2013-10-20 19:39:03.674946800 +0100
+diff -Naur a/Modules/_ctypes/libffi/testsuite/libffi.call/struct1_win32.c b/Modules/_ctypes/libffi/testsuite/libffi.call/struct1_win32.c
+--- a/Modules/_ctypes/libffi/testsuite/libffi.call/struct1_win32.c	2014-05-31 22:58:40.000000000 +0400
++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/struct1_win32.c	2014-06-04 10:17:02.480200000 +0400
 @@ -4,7 +4,7 @@
     PR:		none.
     Originator:	From the original ffitest.c  */
@@ -1412,9 +1413,9 @@ diff -urN a/Modules/_ctypes/libffi/testsuite/libffi.call/struct1_win32.c b/Modul
  #include "ffitest.h"
  
  typedef struct
-diff -urN a/Modules/_ctypes/libffi/testsuite/libffi.call/struct2_win32.c b/Modules/_ctypes/libffi/testsuite/libffi.call/struct2_win32.c
---- a/Modules/_ctypes/libffi/testsuite/libffi.call/struct2_win32.c	2013-10-20 19:38:20.951503200 +0100
-+++ b/Modules/_ctypes/libffi/testsuite/libffi.call/struct2_win32.c	2013-10-20 19:39:03.705948600 +0100
+diff -Naur a/Modules/_ctypes/libffi/testsuite/libffi.call/struct2_win32.c b/Modules/_ctypes/libffi/testsuite/libffi.call/struct2_win32.c
+--- a/Modules/_ctypes/libffi/testsuite/libffi.call/struct2_win32.c	2014-05-31 22:58:40.000000000 +0400
++++ b/Modules/_ctypes/libffi/testsuite/libffi.call/struct2_win32.c	2014-06-04 10:17:02.495800000 +0400
 @@ -4,7 +4,7 @@
     PR:		none.
     Originator:	From the original ffitest.c  */
@@ -1424,9 +1425,9 @@ diff -urN a/Modules/_ctypes/libffi/testsuite/libffi.call/struct2_win32.c b/Modul
  #include "ffitest.h"
  
  typedef struct
-diff -urN a/Modules/makesetup b/Modules/makesetup
---- a/Modules/makesetup	2013-10-20 19:38:20.741491100 +0100
-+++ b/Modules/makesetup	2013-10-20 19:39:03.736950300 +0100
+diff -Naur a/Modules/makesetup b/Modules/makesetup
+--- a/Modules/makesetup	2014-05-31 22:58:40.000000000 +0400
++++ b/Modules/makesetup	2014-06-04 10:17:02.495800000 +0400
 @@ -85,7 +85,7 @@
  # Setup to link with extra libraries when makeing shared extensions.
  # Currently, only Cygwin needs this baggage.
@@ -1436,9 +1437,9 @@ diff -urN a/Modules/makesetup b/Modules/makesetup
  	 then
  	 	ExtraLibDir=.
  	 else
-diff -urN a/Modules/zlib/configure b/Modules/zlib/configure
---- a/Modules/zlib/configure	2013-10-20 19:38:20.776493100 +0100
-+++ b/Modules/zlib/configure	2013-10-20 19:39:03.802954100 +0100
+diff -Naur a/Modules/zlib/configure b/Modules/zlib/configure
+--- a/Modules/zlib/configure	2014-05-31 22:58:40.000000000 +0400
++++ b/Modules/zlib/configure	2014-06-04 10:17:02.495800000 +0400
 @@ -77,7 +77,7 @@
    CFLAGS="$cflags"
    case `(uname -s || echo unknown) 2>/dev/null` in
@@ -1448,9 +1449,9 @@ diff -urN a/Modules/zlib/configure b/Modules/zlib/configure
               EXE='.exe';;
    QNX*)  # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4
           # (alain.bonnefoy@icbt.com)
-diff -urN a/setup.py b/setup.py
---- a/setup.py	2013-10-20 19:38:22.086568100 +0100
-+++ b/setup.py	2013-10-20 19:39:03.831955800 +0100
+diff -Naur a/setup.py b/setup.py
+--- a/setup.py	2014-06-04 10:16:57.223000000 +0400
++++ b/setup.py	2014-06-04 10:17:02.511400000 +0400
 @@ -314,7 +314,7 @@
  
          # Workaround for Cygwin: Cygwin currently has fork issues when many
@@ -1460,7 +1461,7 @@ diff -urN a/setup.py b/setup.py
              self.announce('WARNING: skipping import check for Cygwin-based "%s"'
                  % ext.name)
              return
-@@ -549,7 +549,7 @@
+@@ -551,7 +551,7 @@
  
          # Check for MacOS X, which doesn't need libm.a at all
          math_libs = ['m']
@@ -1469,7 +1470,7 @@ diff -urN a/setup.py b/setup.py
              math_libs = []
  
          # XXX Omitted modules: gl, pure, dl, SGI-specific modules
-@@ -1331,7 +1331,7 @@
+@@ -1332,7 +1332,7 @@
                  missing.append('resource')
  
              # Sun yellow pages. Some systems have the functions in libc.
@@ -1478,7 +1479,7 @@ diff -urN a/setup.py b/setup.py
                  find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None):
                  if (self.compiler.find_library_file(lib_dirs, 'nsl')):
                      libs = ['nsl']
-@@ -1546,7 +1546,7 @@
+@@ -1554,7 +1554,7 @@
              macros = dict()
              libraries = []
  
diff --git a/python2/Python-2.7.5-reorder-bininstall-ln-symlink-creation.patch b/python2/0210-reorder-bininstall-ln-symlink-creation.patch
similarity index 71%
rename from python2/Python-2.7.5-reorder-bininstall-ln-symlink-creation.patch
rename to python2/0210-reorder-bininstall-ln-symlink-creation.patch
index 12ff4e49..ca68fd84 100644
--- a/python2/Python-2.7.5-reorder-bininstall-ln-symlink-creation.patch
+++ b/python2/0210-reorder-bininstall-ln-symlink-creation.patch
@@ -1,7 +1,7 @@
-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 @@
+diff -Naur a/Makefile.pre.in b/Makefile.pre.in
+--- a/Makefile.pre.in	2014-05-31 22:58:39.000000000 +0400
++++ b/Makefile.pre.in	2014-06-04 10:17:05.303800000 +0400
+@@ -856,9 +856,9 @@
  	then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
  	else true; \
  	fi
diff --git a/python2/2.7.6-allow-win-drives-in-os-path-isabs.patch b/python2/0250-allow-win-drives-in-os-path-isabs.patch
similarity index 63%
rename from python2/2.7.6-allow-win-drives-in-os-path-isabs.patch
rename to python2/0250-allow-win-drives-in-os-path-isabs.patch
index 223ac80f..b4a2429c 100644
--- a/python2/2.7.6-allow-win-drives-in-os-path-isabs.patch
+++ b/python2/0250-allow-win-drives-in-os-path-isabs.patch
@@ -1,5 +1,6 @@
---- a/Lib/posixpath.py	2014-02-21 10:34:28.539709900 +0000
-+++ b/Lib/posixpath.py	2014-02-21 10:37:02.070491400 +0000
+diff -Naur a/Lib/posixpath.py b/Lib/posixpath.py
+--- a/Lib/posixpath.py	2014-05-31 22:58:39.000000000 +0400
++++ b/Lib/posixpath.py	2014-06-04 10:17:07.768600000 +0400
 @@ -58,7 +58,11 @@
  
  def isabs(s):
diff --git a/python2/2.7.5-ssl-threads.patch b/python2/2.7.5-ssl-threads.patch
deleted file mode 100644
index ac518bde..00000000
--- a/python2/2.7.5-ssl-threads.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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 { \
diff --git a/python2/PKGBUILD b/python2/PKGBUILD
index 8e375821..edaaff2e 100644
--- a/python2/PKGBUILD
+++ b/python2/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Ray Donnelly <mingw.android@gmail.com>
 
 pkgname=python2
-pkgver=2.7.6
-pkgrel=2
+pkgver=2.7.7
+pkgrel=1
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64')
@@ -15,61 +15,61 @@ makedepends=('libbz2-devel' 'openssl-devel' 'zlib-devel' 'libexpat-devel' 'libsq
 conflicts=('python<3')
 options=('!makeflags')
 source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
-    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
-    2.7.6-allow-win-drives-in-os-path-isabs.patch)
-sha1sums=('8321636af2acbeaa68fc635d7dda7369ed446a80'
-          '76474752d5b84ad78d53f418d554b5c706fcbca7'
-          '2b5f115573d089801f023c16bacc08963f039272'
-          '6e842d2ac2ef6dae07ca14c75348addf6621bf24'
-          '53a3a7c2cd5412bc382d94043983362da80aed03'
-          '7dfd15538406481a1e87edc6d1ad5480c997201a'
-          '91ed9faad8f4ae97b5a69bfb8690401047f0178f'
-          'dbbf0ebb32663740062106bb232157af262767ae'
-          'e9764f8c852d7f19a995f2f1cc38d94ba036e007'
-          'de7bb49c1e6a34bf3abee109f69bedb4e4e686a9'
-          'cfce9aa371d876c7bf47732a4271f1201028ce7a'
-          'eee4ce3f7c26b5c69729d2a5033d2f5277bc6868'
-          'eaf864af38e8b2bd3952ca9e7fbb6efb6191b792'
-          'f6e392723ed2a4b7fe0138522baa0e0f7b8b3660'
-          'efbee46e7f1485985409db0f25adbb18ecb4a4ae'
-          'fb78069fadcf5394ba380e26e371ad687d344415'
-          '7e53560390aff658bbbb9384bef6b1871bffda14')
+        0010-ctypes-util-find_library.patch
+        0020-tkinter-x11.patch
+        0030-ssl-threads.patch
+        0040-FD_SETSIZE.patch
+        0050-export-PySignal_SetWakeupFd.patch
+        0060-ncurses-abi6.patch
+        0070-dbm.patch
+        0080-dylib.patch
+        0090-getpath-exe-extension.patch
+        0100-no-libm.patch
+        0110-export-PyNode_SizeOf.patch
+        0120-fix-sqlite-module.patch
+        0200-msys2.patch
+        0210-reorder-bininstall-ln-symlink-creation.patch
+        0250-allow-win-drives-in-os-path-isabs.patch
+        2.7.5-allow-windows-paths-for-executable.patch)
+sha1sums=('5f82557cac5abf18d1df6f8bb2029aa335b321f4'
+          'ff18e75ffa0351c481ca45065cdcc5cd83857712'
+          'eb3a15abc19c26754121b9a8f9e3e49055424e09'
+          '53ddc2e463046aed4dfcff42a832a2edceb66867'
+          'd16f8f3ea8b5a7760d2e44f45ffe396618891ede'
+          'ec92fce6407bf7583a499aa513a7c04087176c56'
+          'b93fa24ecdf19a72b21c86521887c9a9321922a0'
+          '6ff10519b5386a2b29d57f5385d723bd65742bcc'
+          'ebc73f45bb01a28519b1a5c9d124a28943724b80'
+          '4fd71aac6a4316c9350150dd35d15196ed01efeb'
+          '215d3f1e68aaf1c31b8a9f94ed8b2d03d42c4c03'
+          '32f17eb68c83b4a62219421f58c7082673ba2d58'
+          'f0a9ff9081bbc3df4eab8a6ec1492b5d537f9ca1'
+          'c7987769cd5c4a9e0487b8288b66fa708a9585c2'
+          'e6e13cb541efaaf228355cb1d7d5cd8574757c72'
+          '80975639f5ad78fd15b8f81bd98fb460c4ee05c4'
+          'fb78069fadcf5394ba380e26e371ad687d344415')
 
 prepare() {
   cd "${srcdir}/Python-${pkgver}"
 
-  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}/0010-ctypes-util-find_library.patch
+  patch -p1 -i ${srcdir}/0020-tkinter-x11.patch
+  patch -p1 -i ${srcdir}/0030-ssl-threads.patch
+  patch -p1 -i ${srcdir}/0040-FD_SETSIZE.patch
+  patch -p1 -i ${srcdir}/0050-export-PySignal_SetWakeupFd.patch
+  patch -p1 -i ${srcdir}/0060-ncurses-abi6.patch
+  patch -p1 -i ${srcdir}/0070-dbm.patch
+  patch -p1 -i ${srcdir}/0080-dylib.patch
+  patch -p1 -i ${srcdir}/0090-getpath-exe-extension.patch
+  patch -p1 -i ${srcdir}/0100-no-libm.patch
+  patch -p1 -i ${srcdir}/0110-export-PyNode_SizeOf.patch
+  patch -p1 -i ${srcdir}/0120-fix-sqlite-module.patch
+  patch -p1 -i ${srcdir}/0200-msys2.patch
+  patch -p1 -i ${srcdir}/0210-reorder-bininstall-ln-symlink-creation.patch
+  patch -p1 -i ${srcdir}/0250-allow-win-drives-in-os-path-isabs.patch
   
   # Incomplete patch from Ray Donnelly
   # patch -p1 -i ${srcdir}/2.7.5-allow-windows-paths-for-executable.patch
-  patch -p1 -i ${srcdir}/2.7.6-allow-win-drives-in-os-path-isabs.patch
 
   # Temporary workaround for FS#22322
   # See http://bugs.python.org/issue10835 for upstream report
@@ -149,5 +149,5 @@ package() {
   install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
   
   # fix permissons
-  find ${pkgdir}/usr -type f \( -name *.dll -o -name *.exe \) | xargs chmod 0755
+  find ${pkgdir}/usr -type f \( -name "*.dll" -o -name "*.exe"  \) | xargs chmod 0755
 }
diff --git a/python2/Python-2.7.5-fix-sqlite-module.patch b/python2/Python-2.7.5-fix-sqlite-module.patch
deleted file mode 100644
index 01663cf2..00000000
--- a/python2/Python-2.7.5-fix-sqlite-module.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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)