Remove expired lang/python32

Python 3.2 has reached it's EOL. Please update to Python 3.5

With hat:	python

16 files changed, 0 insertions, 669 deletions

diff --git a/lang/python32/files/patch-Lib-test_regrtest.py b/lang/python32/files/patch-Lib-test_regrtest.py
deleted file mode 100644
index f3337036cefc..000000000000
--- a/lang/python32/files/patch-Lib-test_regrtest.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- Lib/test/regrtest.py.orig	2011-09-03 18:16:43.000000000 +0200
-+++ Lib/test/regrtest.py	2011-10-28 11:26:04.000000000 +0200
-@@ -1522,6 +1522,8 @@
- _expectations['freebsd6'] = _expectations['freebsd4']
- _expectations['freebsd7'] = _expectations['freebsd4']
- _expectations['freebsd8'] = _expectations['freebsd4']
-+_expectations['freebsd9'] = _expectations['freebsd4']
-+_expectations['freebsd10'] = _expectations['freebsd4']
- 
- class _ExpectedSkips:
-     def __init__(self):
diff --git a/lang/python32/files/patch-Lib__distutils__unixccompiler.py b/lang/python32/files/patch-Lib__distutils__unixccompiler.py
deleted file mode 100644
index 3480dc2b4ca2..000000000000
--- a/lang/python32/files/patch-Lib__distutils__unixccompiler.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# Description: Some python extensions can't be compiled with clang 3.4
-# Issue ID: http://bugs.python.org/issue20767
-# Submitted by: antoine
-
---- ./Lib/distutils/unixccompiler.py.orig	2014-03-09 15:23:38.647562705 +1100
-+++ ./Lib/distutils/unixccompiler.py	2014-03-09 15:23:56.020904510 +1100
-@@ -225,6 +225,8 @@
-         if sys.platform[:6] == "darwin":
-             # MacOSX's linker doesn't understand the -R flag at all
-             return "-L" + dir
-+        elif sys.platform[:7] == "freebsd":
-+            return "-Wl,-rpath=" + dir
-         elif sys.platform[:5] == "hp-ux":
-             if self._is_gcc(compiler):
-                 return ["-Wl,+s", "-L" + dir]
diff --git a/lang/python32/files/patch-Lib_distutils_command_build_ext.py b/lang/python32/files/patch-Lib_distutils_command_build_ext.py
deleted file mode 100644
index 125ea3c254e2..000000000000
--- a/lang/python32/files/patch-Lib_distutils_command_build_ext.py
+++ /dev/null
@@ -1,17 +0,0 @@
---- Lib/distutils/command/build_ext.py.orig	2014-07-20 11:51:54.000000000 +0200
-+++ Lib/distutils/command/build_ext.py	2014-07-20 11:52:52.000000000 +0200
-@@ -236,12 +236,9 @@
-                 # building python standard extensions
-                 self.library_dirs.append('.')
- 
--        # for extensions under Linux or Solaris with a shared Python library,
-         # Python's library directory must be appended to library_dirs
--        sysconfig.get_config_var('Py_ENABLE_SHARED')
--        if ((sys.platform.startswith('linux') or sys.platform.startswith('gnu')
--             or sys.platform.startswith('sunos'))
--            and sysconfig.get_config_var('Py_ENABLE_SHARED')):
-+        # See Issues: #1600860, #4366
-+        if (sysconfig.get_config_var('Py_ENABLE_SHARED')):
-             if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
-                 # building third party extensions
-                 self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
diff --git a/lang/python32/files/patch-Lib_distutils_command_install__lib.py b/lang/python32/files/patch-Lib_distutils_command_install__lib.py
deleted file mode 100644
index 816395cbf2a7..000000000000
--- a/lang/python32/files/patch-Lib_distutils_command_install__lib.py
+++ /dev/null
@@ -1,34 +0,0 @@
-From 9934ce31b8447667f71c211e559a8de71e8263db Mon Sep 17 00:00:00 2001
-From: Brendan Molloy <brendan@bbqsrc.net>
-Date: Mon, 4 Jan 2016 23:14:06 +1100
-Subject: [PATCH] Check bytecode file actually exists and tests
-
-Should solve issue 20397, where using the --record argument results
-in files that failed to generate bytecode files are added to the
-record file nonetheless.
-
---- Lib/distutils/command/install_lib.py.orig	2014-10-12 06:52:02 UTC
-+++ Lib/distutils/command/install_lib.py
-@@ -165,11 +165,18 @@ class install_lib(Command):
-             if ext != PYTHON_SOURCE_EXTENSION:
-                 continue
-             if self.compile:
--                bytecode_files.append(imp.cache_from_source(
--                    py_file, debug_override=True))
-+                candidate = imp.cache_from_source(
-+                    py_file, debug_override=True)
-+
-+            if os.path.isfile(candidate):
-+                bytecode_files.append(candidate)
-+
-             if self.optimize > 0:
--                bytecode_files.append(imp.cache_from_source(
--                    py_file, debug_override=False))
-+                candidate = imp.cache_from_source(
-+                    py_file, debug_override=False)
-+
-+            if os.path.isfile(candidate):
-+                bytecode_files.append(candidate)
- 
-         return bytecode_files
- 
diff --git a/lang/python32/files/patch-Makefile.pre.in b/lang/python32/files/patch-Makefile.pre.in
deleted file mode 100644
index b728834507c3..000000000000
--- a/lang/python32/files/patch-Makefile.pre.in
+++ /dev/null
@@ -1,87 +0,0 @@
-# Description: INSTALL_SHARED sometimes is not properly handled in the env
-# Submitted by: mva
-
-# Description: Remove duplicate CFLAGS, CPPFLAGS, LDFLAGS by stripping CONFIGURE_*
-# Submitted by: koobs (r326729)
-# TODO: Upstream
-
---- Makefile.pre.in.orig	2013-05-15 18:33:51.000000000 +0200
-+++ Makefile.pre.in	2014-07-18 20:54:36.000000000 +0200
-@@ -60,7 +60,7 @@
- # Shared libraries must be installed with executable mode on some systems;
- # rather than figuring out exactly which, we always give them executable mode.
- # Also, making them read-only seems to be a good idea...
--INSTALL_SHARED= ${INSTALL} -m 555
-+INSTALL_SHARED?= ${INSTALL} -m 555
- 
- MKDIR_P=	@MKDIR_P@
- 
-@@ -70,18 +70,18 @@
- OPT=		@OPT@
- BASECFLAGS=	@BASECFLAGS@
- BASECPPFLAGS=	@BASECPPFLAGS@
--CONFIGURE_CFLAGS=	@CFLAGS@
--CONFIGURE_CPPFLAGS=	@CPPFLAGS@
--CONFIGURE_LDFLAGS=	@LDFLAGS@
-+CFLAGS=	@CFLAGS@
-+CPPFLAGS=	@CPPFLAGS@
-+LDFLAGS=	@LDFLAGS@
- # Avoid assigning CFLAGS, LDFLAGS, etc. so users can use them on the
- # command line to append to these values without stomping the pre-set
- # values.
--PY_CFLAGS=	$(BASECFLAGS) $(OPT) $(CONFIGURE_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
-+PY_CFLAGS=	$(BASECFLAGS) $(OPT) $(CFLAGS) $(EXTRA_CFLAGS)
- # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to
- # be able to build extension modules using the directories specified in the
- # environment variables
--PY_CPPFLAGS=	$(BASECPPFLAGS) -I. -IInclude -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS)
--PY_LDFLAGS=	$(CONFIGURE_LDFLAGS) $(LDFLAGS)
-+PY_CPPFLAGS=	$(BASECPPFLAGS) -I. -IInclude -I$(srcdir)/Include $(CPPFLAGS)
-+PY_LDFLAGS=	$(LDFLAGS)
- NO_AS_NEEDED=	@NO_AS_NEEDED@
- LDLAST=		@LDLAST@
- SGI_ABI=	@SGI_ABI@
-@@ -676,7 +676,7 @@
- Objects/setobject.o: $(srcdir)/Objects/stringlib/eq.h
- 
- $(OPCODETARGETS_H): $(OPCODETARGETGEN_FILES)
--	$(OPCODETARGETGEN) $(OPCODETARGETS_H)
-+#	$(OPCODETARGETGEN) $(OPCODETARGETS_H)
- 
- Python/ceval.o: $(OPCODETARGETS_H) Python/ceval_gil.h
- 
-@@ -686,7 +686,7 @@
- 
- Objects/typeobject.o: Objects/typeslots.inc
- Objects/typeslots.inc: $(srcdir)/Include/typeslots.h $(srcdir)/Objects/typeslots.py
--	$(PYTHON) $(srcdir)/Objects/typeslots.py < $(srcdir)/Include/typeslots.h > Objects/typeslots.inc
-+#	$(PYTHON) $(srcdir)/Objects/typeslots.py < $(srcdir)/Include/typeslots.h > Objects/typeslots.inc
- 
- ############################################################################
- # Header files
-@@ -908,12 +908,6 @@
- 	else true; \
- 	fi
- 	(cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON)3$(EXE))
--	-if test "$(VERSION)" != "$(LDVERSION)"; then \
--		rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \
--		(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config); \
--		rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION).pc; \
--		(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python-$(LDVERSION).pc); \
--	fi
- 	-rm -f $(DESTDIR)$(BINDIR)/python3-config
- 	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python3-config)
- 	-rm -f $(DESTDIR)$(LIBPC)/python3.pc
-@@ -1126,6 +1120,12 @@
- 	$(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup
- 	$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
- 	$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config
-+	-if test "$(VERSION)" != "$(LDVERSION)"; then \
-+		rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \
-+		(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config); \
-+		rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION).pc; \
-+		(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python-$(LDVERSION).pc); \
-+	fi
- 	rm python-config
- 	@if [ -s Modules/python.exp -a \
- 		"`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \
diff --git a/lang/python32/files/patch-Misc_python-config.in b/lang/python32/files/patch-Misc_python-config.in
deleted file mode 100644
index c71439d4df66..000000000000
--- a/lang/python32/files/patch-Misc_python-config.in
+++ /dev/null
@@ -1,32 +0,0 @@
-# pythonx.y-config --ldflags out of /usr and missing -L<install_lib_dir>
-# https://bugs.python.org/issue7352
-
-# Fix library order returned by python-config. [#18096]
-# bugs.python.org/18096
-
---- Misc/python-config.in.orig	2013-05-15 16:33:52 UTC
-+++ Misc/python-config.in
-@@ -22,6 +22,7 @@ except getopt.error:
- if not opts:
-     exit_with_usage()
- 
-+libdir = sysconfig.get_config_var('exec_prefix') + '/lib'
- pyver = sysconfig.get_config_var('VERSION')
- getvar = sysconfig.get_config_var
- 
-@@ -45,11 +46,13 @@ for opt in opt_flags:
-         print(' '.join(flags))
- 
-     elif opt in ('--libs', '--ldflags'):
--        libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
--        libs.append('-lpython' + pyver + sys.abiflags)
-+        libs = ['-lpython' + pyver + sys.abiflags]
-+        libs += getvar('LIBS').split()
-+        libs += getvar('SYSLIBS').split()
-         # add the prefix/lib/pythonX.Y/config dir, but only if there is no
-         # shared library in prefix/lib/.
-         if opt == '--ldflags':
-+            libs.insert(0, '-L' + libdir)
-             if not getvar('Py_ENABLE_SHARED'):
-                 libs.insert(0, '-L' + getvar('LIBPL'))
-             if not getvar('PYTHONFRAMEWORK'):
diff --git a/lang/python32/files/patch-Modules-_ctypes-libffi-configure b/lang/python32/files/patch-Modules-_ctypes-libffi-configure
deleted file mode 100644
index 3bcaaf460e62..000000000000
--- a/lang/python32/files/patch-Modules-_ctypes-libffi-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- Modules/_ctypes/libffi/configure.orig	2011-02-05 04:03:34.000000000 +0000
-+++ Modules/_ctypes/libffi/configure	2011-02-05 04:04:43.000000000 +0000
-@@ -6289,7 +6289,7 @@
-   rm -rf conftest*
-   ;;
- 
--x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+amd64-*-freebsd*|x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
- s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-   # Find out which ABI we are using.
-   echo 'int i;' > conftest.$ac_ext
diff --git a/lang/python32/files/patch-Modules-_ctypes-libffi_fficonfig.py.in b/lang/python32/files/patch-Modules-_ctypes-libffi_fficonfig.py.in
deleted file mode 100644
index a2675bb94dfa..000000000000
--- a/lang/python32/files/patch-Modules-_ctypes-libffi_fficonfig.py.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./Modules/_ctypes/libffi/fficonfig.py.in.orig	2013-05-12 07:32:49.000000000 +0400
-+++ ./Modules/_ctypes/libffi/fficonfig.py.in	2013-06-05 10:36:24.000000000 +0400
-@@ -1,7 +1,6 @@
- ffi_sources = """
- src/prep_cif.c
- src/closures.c
--src/dlmalloc.c
- """.split()
- 
- ffi_platforms = {
diff --git a/lang/python32/files/patch-Modules-fcntlmodule.c b/lang/python32/files/patch-Modules-fcntlmodule.c
deleted file mode 100644
index 6f9f3ab01d0a..000000000000
--- a/lang/python32/files/patch-Modules-fcntlmodule.c
+++ /dev/null
@@ -1,53 +0,0 @@
---- Modules/fcntlmodule.c.orig	2010-12-14 09:44:03.000000000 +0800
-+++ Modules/fcntlmodule.c	2010-12-14 09:47:17.000000000 +0800
-@@ -97,20 +97,15 @@
- {
- #define IOCTL_BUFSZ 1024
-     int fd;
--    /* In PyArg_ParseTuple below, we use the unsigned non-checked 'I'
-+    /* In PyArg_ParseTuple below, we use the unsigned non-checked 'k'
-        format for the 'code' parameter because Python turns 0x8000000
-        into either a large positive number (PyLong or PyInt on 64-bit
-        platforms) or a negative number on others (32-bit PyInt)
-        whereas the system expects it to be a 32bit bit field value
-        regardless of it being passed as an int or unsigned long on
--       various platforms.  See the termios.TIOCSWINSZ constant across
--       platforms for an example of thise.
--
--       If any of the 64bit platforms ever decide to use more than 32bits
--       in their unsigned long ioctl codes this will break and need
--       special casing based on the platform being built on.
-+       various platforms.
-      */
--    unsigned int code;
-+    unsigned long code;
-     int arg;
-     int ret;
-     Py_buffer pstr;
-@@ -119,7 +114,7 @@
-     int mutate_arg = 1;
-     char buf[IOCTL_BUFSZ+1];  /* argument plus NUL byte */
- 
--    if (PyArg_ParseTuple(args, "O&Iw*|i:ioctl",
-+    if (PyArg_ParseTuple(args, "O&kw*|i:ioctl",
-                          conv_descriptor, &fd, &code,
-                          &pstr, &mutate_arg)) {
-         char *arg;
-@@ -174,7 +169,7 @@
-     }
- 
-     PyErr_Clear();
--    if (PyArg_ParseTuple(args, "O&Is*:ioctl",
-+    if (PyArg_ParseTuple(args, "O&ks*:ioctl",
-                          conv_descriptor, &fd, &code, &pstr)) {
-         str = pstr.buf;
-         len = pstr.len;
-@@ -201,7 +196,7 @@
-     PyErr_Clear();
-     arg = 0;
-     if (!PyArg_ParseTuple(args,
--         "O&I|i;ioctl requires a file or file descriptor,"
-+         "O&k|i;ioctl requires a file or file descriptor,"
-          " an integer and optionally an integer or buffer argument",
-                           conv_descriptor, &fd, &code, &arg)) {
-       return NULL;
diff --git a/lang/python32/files/patch-Modules___ctypes__libffi__src__arm__ffi.c b/lang/python32/files/patch-Modules___ctypes__libffi__src__arm__ffi.c
deleted file mode 100644
index 94f851301023..000000000000
--- a/lang/python32/files/patch-Modules___ctypes__libffi__src__arm__ffi.c
+++ /dev/null
@@ -1,36 +0,0 @@
-# Description: Fix _ctypes abort on import for FreeBSD/ARM. This is an issue
-# for anything !apple that is using the libcompiler_rt provided by clang on arm
-# PR: ports/149167 ports/184517
-# Patch by: cognet@ (to be upstreamed @ LLVM)
-
---- ./Modules/_ctypes/libffi/src/arm/ffi.c.orig	2013-05-16 02:33:52.000000000 +1000
-+++ ./Modules/_ctypes/libffi/src/arm/ffi.c	2013-12-03 19:19:36.700951785 +1100
-@@ -33,6 +33,11 @@
- 
- #include <stdlib.h>
- 
-+#if defined(__FreeBSD__) && defined(__arm__)
-+#include <sys/types.h>
-+#include <machine/sysarch.h>
-+#endif
-+
- /* Forward declares. */
- static int vfp_type_p (ffi_type *);
- static void layout_vfp_args (ffi_cif *);
-@@ -582,6 +587,16 @@
- 
- #else
- 
-+#if defined(__FreeBSD__) && defined(__arm__)
-+#define __clear_cache(start, end) do { \
-+		struct arm_sync_icache_args ua; 		\
-+								\
-+		ua.addr = (uintptr_t)(start);			\
-+		ua.len = (char *)(end) - (char *)start;		\
-+		sysarch(ARM_SYNC_ICACHE, &ua);			\
-+	} while (0);
-+#endif
-+
- #define FFI_INIT_TRAMPOLINE(TRAMP,FUN,CTX)				\
- ({ unsigned char *__tramp = (unsigned char*)(TRAMP);			\
-    unsigned int  __fun = (unsigned int)(FUN);				\
diff --git a/lang/python32/files/patch-Modules__selectmodule.c b/lang/python32/files/patch-Modules__selectmodule.c
deleted file mode 100644
index 5a14678829f0..000000000000
--- a/lang/python32/files/patch-Modules__selectmodule.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./Modules/selectmodule.c.orig	2013-11-30 23:03:20.030929248 +1100
-+++ ./Modules/selectmodule.c	2013-11-30 23:03:56.111022639 +1100
-@@ -1246,7 +1246,7 @@
-     PyObject *pfd;
-     static char *kwlist[] = {"ident", "filter", "flags", "fflags",
-                              "data", "udata", NULL};
--    static char *fmt = "O|hhi" INTPTRT_FMT_UNIT UINTPTRT_FMT_UNIT ":kevent";
-+    static char *fmt = "O|hHI" INTPTRT_FMT_UNIT UINTPTRT_FMT_UNIT ":kevent";
- 
-     EV_SET(&(self->e), 0, EVFILT_READ, EV_ADD, 0, 0, 0); /* defaults */
- 
diff --git a/lang/python32/files/patch-PR195513 b/lang/python32/files/patch-PR195513
deleted file mode 100644
index 062c432ec03a..000000000000
--- a/lang/python32/files/patch-PR195513
+++ /dev/null
@@ -1,174 +0,0 @@
---- Lib/ssl.py.orig	2014-10-12 08:52:02.000000000 +0200
-+++ Lib/ssl.py	2015-12-23 11:29:24.243085919 +0100
-@@ -63,7 +63,16 @@ from _ssl import OPENSSL_VERSION_NUMBER,
- from _ssl import _SSLContext, SSLError
- from _ssl import CERT_NONE, CERT_OPTIONAL, CERT_REQUIRED
- from _ssl import OP_ALL, OP_NO_SSLv2, OP_NO_SSLv3, OP_NO_TLSv1
--from _ssl import RAND_status, RAND_egd, RAND_add
-+### Fix build with LibreSSL (does not have RAND_egd)
-+### PR195513, http://bugs.python.org/issue21356
-+from _ssl import RAND_status, RAND_add
-+try:
-+    from _ssl import RAND_egd
-+except ImportError:
-+    # LibreSSL does not provide RAND_egd
-+    pass
-+### End PR195513
-+
- from _ssl import (
-     SSL_ERROR_ZERO_RETURN,
-     SSL_ERROR_WANT_READ,
-@@ -76,13 +85,12 @@ from _ssl import (
-     SSL_ERROR_INVALID_ERROR_CODE,
-     )
- from _ssl import HAS_SNI
--from _ssl import PROTOCOL_SSLv3, PROTOCOL_SSLv23, PROTOCOL_TLSv1
-+from _ssl import PROTOCOL_SSLv23, PROTOCOL_TLSv1
- from _ssl import _OPENSSL_API_VERSION
- 
- _PROTOCOL_NAMES = {
-     PROTOCOL_TLSv1: "TLSv1",
-     PROTOCOL_SSLv23: "SSLv23",
--    PROTOCOL_SSLv3: "SSLv3",
- }
- try:
-     from _ssl import PROTOCOL_SSLv2
-@@ -91,6 +99,13 @@ except ImportError:
-     _SSLv2_IF_EXISTS = None
- else:
-     _PROTOCOL_NAMES[PROTOCOL_SSLv2] = "SSLv2"
-+try:
-+    from _ssl import PROTOCOL_SSLv3
-+    _SSLv3_IF_EXISTS = PROTOCOL_SSLv3
-+except ImportError:
-+    _SSLv3_IF_EXISTS = None
-+else:
-+    _PROTOCOL_NAMES[PROTOCOL_SSLv3] = "SSLv3"
- 
- from socket import getnameinfo as _getnameinfo
- from socket import error as socket_error
-@@ -557,7 +572,7 @@ def PEM_cert_to_DER_cert(pem_cert_string
-     d = pem_cert_string.strip()[len(PEM_HEADER):-len(PEM_FOOTER)]
-     return base64.decodebytes(d.encode('ASCII', 'strict'))
- 
--def get_server_certificate(addr, ssl_version=PROTOCOL_SSLv3, ca_certs=None):
-+def get_server_certificate(addr, ssl_version=PROTOCOL_SSLv23, ca_certs=None):
-     """Retrieve the certificate from the server at the specified address,
-     and return it as a PEM-encoded string.
-     If 'ca_certs' is specified, validate the server cert against it.
---- Lib/test/test_ssl.py.orig	2014-10-12 08:52:03.000000000 +0200
-+++ Lib/test/test_ssl.py	2015-12-23 11:29:24.245086385 +0100
-@@ -21,11 +21,12 @@ import functools
- ssl = support.import_module("ssl")
- 
- PROTOCOLS = [
--    ssl.PROTOCOL_SSLv3,
-     ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1
- ]
- if hasattr(ssl, 'PROTOCOL_SSLv2'):
-     PROTOCOLS.append(ssl.PROTOCOL_SSLv2)
-+if hasattr(ssl, 'PROTOCOL_SSLv3'):
-+    PROTOCOLS.append(ssl.PROTOCOL_SSLv3)
- 
- HOST = support.HOST
- 
-@@ -104,8 +105,12 @@ class BasicSocketTests(unittest.TestCase
-             sys.stdout.write("\n RAND_status is %d (%s)\n"
-                              % (v, (v and "sufficient randomness") or
-                                 "insufficient randomness"))
--        self.assertRaises(TypeError, ssl.RAND_egd, 1)
--        self.assertRaises(TypeError, ssl.RAND_egd, 'foo', 1)
-+### Fix build with LibreSSL (does not have RAND_egd)
-+### PR195513, http://bugs.python.org/issue21356        
-+        if hasattr(ssl, 'RAND_egd'):
-+            self.assertRaises(TypeError, ssl.RAND_egd, 1)
-+            self.assertRaises(TypeError, ssl.RAND_egd, 'foo', 1)
-+### End PR195513
-         ssl.RAND_add("this is a random string", 75.0)
- 
-     def test_parse_cert(self):
-@@ -380,7 +385,8 @@ class ContextTests(unittest.TestCase):
-         if hasattr(ssl, 'PROTOCOL_SSLv2'):
-             ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv2)
-         ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
--        ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv3)
-+        if hasattr(ssl, 'PROTOCOL_SSLv3'):
-+            ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv3)
-         ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
-         self.assertRaises(TypeError, ssl.SSLContext)
-         self.assertRaises(ValueError, ssl.SSLContext, -1)
-@@ -1372,6 +1378,7 @@ else:
- 
- 
-         @skip_if_broken_ubuntu_ssl
-+        @unittest.skipUnless(hasattr(ssl, 'PROTOCOL_SSLv3'), "need SSLv3")
-         def test_protocol_sslv3(self):
-             """Connecting to an SSLv3 server with various client options"""
-             if support.verbose:
---- Modules/_ssl.c.orig	2014-10-12 08:52:03.000000000 +0200
-+++ Modules/_ssl.c	2015-12-23 11:29:24.242085898 +0100
-@@ -66,7 +66,9 @@ enum py_ssl_version {
- #ifndef OPENSSL_NO_SSL2
-     PY_SSL_VERSION_SSL2,
- #endif
--    PY_SSL_VERSION_SSL3=1,
-+#ifndef OPENSSL_NO_SSL3
-+    PY_SSL_VERSION_SSL3,
-+#endif
-     PY_SSL_VERSION_SSL23,
-     PY_SSL_VERSION_TLS1
- };
-@@ -1512,8 +1514,10 @@ context_new(PyTypeObject *type, PyObject
-     PySSL_BEGIN_ALLOW_THREADS
-     if (proto_version == PY_SSL_VERSION_TLS1)
-         ctx = SSL_CTX_new(TLSv1_method());
-+#ifndef OPENSSL_NO_SSL3
-     else if (proto_version == PY_SSL_VERSION_SSL3)
-         ctx = SSL_CTX_new(SSLv3_method());
-+#endif
- #ifndef OPENSSL_NO_SSL2
-     else if (proto_version == PY_SSL_VERSION_SSL2)
-         ctx = SSL_CTX_new(SSLv2_method());
-@@ -1965,6 +1969,9 @@ Returns 1 if the OpenSSL PRNG has been s
- It is necessary to seed the PRNG with RAND_add() on some platforms before\n\
- using the ssl() function.");
- 
-+/* ### Fix build with LibreSSL (does not have RAND_egd)
-+   ### PR195513, http://bugs.python.org/issue21356 */
-+#ifndef OPENSSL_NO_EGD
- static PyObject *
- PySSL_RAND_egd(PyObject *self, PyObject *args)
- {
-@@ -1992,6 +1999,8 @@ PyDoc_STRVAR(PySSL_RAND_egd_doc,
- Queries the entropy gather daemon (EGD) on the socket named by 'path'.\n\
- Returns number of bytes read.  Raises SSLError if connection to EGD\n\
- fails or if it does provide enough data to seed PRNG.");
-+#endif /* OPENSSL_NO_EGD */
-+/* ### End PR195513  */
- 
- #endif
- 
-@@ -2005,8 +2014,12 @@ static PyMethodDef PySSL_methods[] = {
- #ifdef HAVE_OPENSSL_RAND
-     {"RAND_add",            PySSL_RAND_add, METH_VARARGS,
-      PySSL_RAND_add_doc},
-+/* ### Fix build with LibreSSL (does not have RAND_egd)
-+   ### PR195513, http://bugs.python.org/issue21356 */
-+#ifndef OPENSSL_NO_EGD
-     {"RAND_egd",            PySSL_RAND_egd, METH_VARARGS,
-      PySSL_RAND_egd_doc},
-+#endif /* OPENSSL_NO_EGD */
-     {"RAND_status",         (PyCFunction)PySSL_RAND_status, METH_NOARGS,
-      PySSL_RAND_status_doc},
- #endif
-@@ -2199,8 +2212,10 @@ PyInit__ssl(void)
-     PyModule_AddIntConstant(m, "PROTOCOL_SSLv2",
-                             PY_SSL_VERSION_SSL2);
- #endif
-+#ifndef OPENSSL_NO_SSL3
-     PyModule_AddIntConstant(m, "PROTOCOL_SSLv3",
-                             PY_SSL_VERSION_SSL3);
-+#endif
-     PyModule_AddIntConstant(m, "PROTOCOL_SSLv23",
-                             PY_SSL_VERSION_SSL23);
-     PyModule_AddIntConstant(m, "PROTOCOL_TLSv1",
diff --git a/lang/python32/files/patch-changeset-d158b0a78390 b/lang/python32/files/patch-changeset-d158b0a78390
deleted file mode 100644
index 9f1eb2743b2c..000000000000
--- a/lang/python32/files/patch-changeset-d158b0a78390
+++ /dev/null
@@ -1,24 +0,0 @@
-# HG changeset patch (based on)
-# User doko@ubuntu.com
-# Date 1341068713 -7200
-# Node ID d158b0a78390c104540c69d9d73f9c31fc5577dc
-# Parent  575efae8ec5777b6130c29f7917d4e05303cfe12
-- Issue #3754: Some unrelated configure.ac cleanups.
-
---- configure.orig	2015-01-21 11:43:28 UTC
-+++ configure
-@@ -9439,13 +9439,13 @@ fi
- if test -z "$with_pymalloc"
- then
-     with_pymalloc="yes"
--    ABIFLAGS="${ABIFLAGS}m"
- fi
- if test "$with_pymalloc" != "no"
- then
- 
- $as_echo "#define WITH_PYMALLOC 1" >>confdefs.h
- 
-+    ABIFLAGS="${ABIFLAGS}m"
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_pymalloc" >&5
- $as_echo "$with_pymalloc" >&6; }
diff --git a/lang/python32/files/patch-issue20374 b/lang/python32/files/patch-issue20374
deleted file mode 100644
index 3725264e8c06..000000000000
--- a/lang/python32/files/patch-issue20374
+++ /dev/null
@@ -1,54 +0,0 @@
-# Description: fix readline.so build with readline 6.3
-# Patch obtained from upstream, issue #20374
-# http://bugs.python.org/issue20374
-
---- ./Modules/readline.c.orig	2013-05-15 16:33:54.000000000 +0000
-+++ ./Modules/readline.c	2014-03-01 14:58:46.000000000 +0000
-@@ -761,14 +761,22 @@
- }
- 
- static int
-+#if defined(_RL_FUNCTION_TYPEDEF)
- on_startup_hook(void)
-+#else
-+on_startup_hook()
-+#endif
- {
-     return on_hook(startup_hook);
- }
- 
- #ifdef HAVE_RL_PRE_INPUT_HOOK
- static int
-+#if defined(_RL_FUNCTION_TYPEDEF)
- on_pre_input_hook(void)
-+#else
-+on_pre_input_hook()
-+#endif
- {
-     return on_hook(pre_input_hook);
- }
-@@ -864,7 +872,7 @@
-  * before calling the normal completer */
- 
- static char **
--flex_complete(char *text, int start, int end)
-+flex_complete(const char *text, int start, int end)
- {
- #ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
-     rl_completion_append_character ='\0';
-@@ -912,12 +920,12 @@
-     rl_bind_key_in_map ('\t', rl_complete, emacs_meta_keymap);
-     rl_bind_key_in_map ('\033', rl_complete, emacs_meta_keymap);
-     /* Set our hook functions */
--    rl_startup_hook = (Function *)on_startup_hook;
-+    rl_startup_hook = on_startup_hook;
- #ifdef HAVE_RL_PRE_INPUT_HOOK
--    rl_pre_input_hook = (Function *)on_pre_input_hook;
-+    rl_pre_input_hook = on_pre_input_hook;
- #endif
-     /* Set our completion function */
--    rl_attempted_completion_function = (CPPFunction *)flex_complete;
-+    rl_attempted_completion_function = flex_complete;
-     /* Set Python word break characters */
-     rl_completer_word_break_characters =
-         strdup(" \t\n`~!@#$%^&*()-=+[{]}\\|;:'\",<>/?");
diff --git a/lang/python32/files/patch-setup.py b/lang/python32/files/patch-setup.py
deleted file mode 100644
index 2a50679effc5..000000000000
--- a/lang/python32/files/patch-setup.py
+++ /dev/null
@@ -1,90 +0,0 @@
---- setup.py.orig	2013-05-15 18:33:58.000000000 +0200
-+++ setup.py	2014-07-27 11:00:57.000000000 +0200
-@@ -21,7 +21,7 @@
- COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
- 
- # This global variable is used to hold the list of modules to be disabled.
--disabled_module_list = []
-+disabled_module_list = ["_sqlite3", "_tkinter", "_gdbm"]
- 
- # File which contains the directory for shared mods (for sys.path fixup
- # when running from the build dir, see Modules/getpath.c)
-@@ -235,8 +235,8 @@
-         # unfortunately, distutils doesn't let us provide separate C and C++
-         # compilers
-         if compiler is not None:
--            (ccshared,cflags) = sysconfig.get_config_vars('CCSHARED','CFLAGS')
--            args['compiler_so'] = compiler + ' ' + ccshared + ' ' + cflags
-+            (ccshared,opt,cflags) = sysconfig.get_config_vars('CCSHARED','OPT','CFLAGS')
-+            args['compiler_so'] = compiler + ' ' + ccshared + ' ' + opt + ' ' + cflags
-         self.compiler.set_executables(**args)
- 
-         # Not only do we write the builddir cookie, but we manually install
-@@ -668,7 +668,7 @@
-                                                      'termcap'):
-                 readline_libs.append('termcap')
-             exts.append( Extension('readline', ['readline.c'],
--                                   library_dirs=['/usr/lib/termcap'],
-+                                   library_dirs=['/usr/lib','/usr/lib/termcap'],
-                                    extra_link_args=readline_extra_link_args,
-                                    libraries=readline_libs) )
-         else:
-@@ -1373,7 +1373,7 @@
-             macros = dict()
-             libraries = []
- 
--        elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
-+        elif platform in ('freebsd7', 'freebsd8', 'freebsd9', 'freebsd10', 'freebsd11'):
-             # FreeBSD's P1003.1b semaphore support is very experimental
-             # and has many known problems. (as of June 2008)
-             macros = dict()
-@@ -1416,9 +1416,12 @@
-         # End multiprocessing
- 
-         # Platform-specific libraries
--        if (platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
--                        'freebsd7', 'freebsd8')
--            or platform.startswith("gnukfreebsd")):
-+        #############################
-+        # Backport Commit: http://hg.python.org/cpython/rev/50f1922bc1d5
-+        # Backport Issue: http://bugs.python.org/issue12326
-+        #############################
-+        if any(platform.startswith(prefix)
-+               for prefix in ("linux", "freebsd", "gnukfreebsd")):
-             exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
-         else:
-             missing.append('ossaudiodev')
-@@ -1443,6 +1446,18 @@
-         if '_tkinter' not in [e.name for e in self.extensions]:
-             missing.append('_tkinter')
- 
-+        #############################
-+        # Backport Commit: http://hg.python.org/cpython/rev/e5607874e8ff
-+        # Backport Issue: http://bugs.python.org/issue18517
-+        #############################
-+##         # Uncomment these lines if you want to play with xxmodule.c
-+##         ext = Extension('xx', ['xxmodule.c'])
-+##         self.extensions.append(ext)
-+        if 'd' not in sys.abiflags:
-+            ext = Extension('xxlimited', ['xxlimited.c'],
-+                            define_macros=[('Py_LIMITED_API', 1)])
-+            self.extensions.append(ext)
-+
-         return missing
- 
-     def detect_tkinter_darwin(self, inc_dirs, lib_dirs):
-@@ -1641,14 +1656,6 @@
-                         )
-         self.extensions.append(ext)
- 
--##         # Uncomment these lines if you want to play with xxmodule.c
--##         ext = Extension('xx', ['xxmodule.c'])
--##         self.extensions.append(ext)
--        if 'd' not in sys.abiflags:
--            ext = Extension('xxlimited', ['xxlimited.c'],
--                            define_macros=[('Py_LIMITED_API', 1)])
--            self.extensions.append(ext)
--
-         # XXX handle these, but how to detect?
-         # *** Uncomment and edit for PIL (TkImaging) extension only:
-         #       -DWITH_PIL -I../Extensions/Imaging/libImaging  tkImaging.c \
diff --git a/lang/python32/files/pkg-message.in b/lang/python32/files/pkg-message.in
deleted file mode 100644
index c2325386f571..000000000000
--- a/lang/python32/files/pkg-message.in
+++ /dev/null
@@ -1,10 +0,0 @@
-===========================================================================
-
-Note that some standard Python modules are provided as separate ports
-as they require additional dependencies. They are available as:
-
-py%%PYTHON_SUFFIX%%-gdbm       databases/py%%PYTHON_SUFFIX%%-gdbm
-py%%PYTHON_SUFFIX%%-sqlite3    databases/py%%PYTHON_SUFFIX%%-sqlite3
-py%%PYTHON_SUFFIX%%-tkinter    x11-toolkits/py%%PYTHON_SUFFIX%%-tkinter
-
-===========================================================================