24 files changed, 26 insertions, 1875 deletions

diff --git a/lang/python31/files/patch-Lib-test-test_zlib.py b/lang/python31/files/patch-Lib-test-test_zlib.py
deleted file mode 100644
index 425572d2574d..000000000000
--- a/lang/python31/files/patch-Lib-test-test_zlib.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- Lib/test/test_zlib.py	2008/04/08 23:47:30	62234
-+++ Lib/test/test_zlib.py	2008/04/09 00:25:17	62235
-@@ -83,6 +83,11 @@
-         # verify failure on building decompress object with bad params
-         self.assertRaises(ValueError, zlib.decompressobj, 0)
- 
-+    def test_decompressobj_badflush(self):
-+        # verify failure on calling decompressobj.flush with bad params
-+        self.assertRaises(ValueError, zlib.decompressobj().flush, 0)
-+        self.assertRaises(ValueError, zlib.decompressobj().flush, -1)
-+
- 
- 
- class CompressTestCase(unittest.TestCase):
diff --git a/lang/python31/files/patch-Modules-_ctypes-libffi-configure b/lang/python31/files/patch-Modules-_ctypes-libffi-configure
index 89b31267f174..c788e1813719 100644
--- a/lang/python31/files/patch-Modules-_ctypes-libffi-configure
+++ b/lang/python31/files/patch-Modules-_ctypes-libffi-configure
@@ -1,11 +1,11 @@
---- Modules/_ctypes/libffi/configure.orig	Sun Mar 26 13:22:58 2006
-+++ Modules/_ctypes/libffi/configure	Sun Mar 26 13:23:07 2006
-@@ -3520,7 +3520,7 @@
- cris-*-*) TARGET=LIBFFI_CRIS; TARGETDIR=cris;;
- s390-*-linux-*) TARGET=S390; TARGETDIR=s390;;
- s390x-*-linux-*) TARGET=S390; TARGETDIR=s390;;
--x86_64-*-linux* | x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu) TARGET=X86_64; TARGETDIR=x86;;
-+amd64-*-freebsd* | x86_64-*-linux* | x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu) TARGET=X86_64; TARGETDIR=x86;;
- sh-*-linux* | sh[34]*-*-linux*) TARGET=SH; TARGETDIR=sh;;
- sh-*-rtems*) TARGET=SH; TARGETDIR=sh;;
- sh64-*-linux* | sh5*-*-linux*) TARGET=SH64; TARGETDIR=sh64;;
+--- Modules/_ctypes/libffi/configure.orig	2008-05-24 00:06:50.000000000 +0900
++++ Modules/_ctypes/libffi/configure	2008-10-09 20:24:02.000000000 +0900
+@@ -4725,7 +4725,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*|sparc*-*linux*)
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
diff --git a/lang/python31/files/patch-Modules-zlibmodule.c b/lang/python31/files/patch-Modules-zlibmodule.c
deleted file mode 100644
index 7875a40ada7c..000000000000
--- a/lang/python31/files/patch-Modules-zlibmodule.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- Modules/zlibmodule.c.orig	2008-04-25 01:47:26.000000000 +0200
-+++ Modules/zlibmodule.c	2008-04-25 01:48:17.000000000 +0200
-@@ -774,6 +774,10 @@
- 
-     if (!PyArg_ParseTuple(args, "|i:flush", &length))
- 	return NULL;
-+    if (length <= 0) {
-+	PyErr_SetString(PyExc_ValueError, "length must be greater than zero");
-+	return NULL;
-+	}
-     if (!(retval = PyString_FromStringAndSize(NULL, length)))
- 	return NULL;
- 
diff --git a/lang/python31/files/patch-freebsd8 b/lang/python31/files/patch-freebsd8
deleted file mode 100644
index 51c5c39f7026..000000000000
--- a/lang/python31/files/patch-freebsd8
+++ /dev/null
@@ -1,938 +0,0 @@
-Index: Lib/plat-freebsd6/IN.py
-===================================================================
---- Lib/plat-freebsd6/IN.py	(revision 58696)
-+++ Lib/plat-freebsd6/IN.py	(revision 58697)
-@@ -1,6 +1,28 @@
- # Generated by h2py from /usr/include/netinet/in.h
- 
- # Included from sys/cdefs.h
-+__GNUCLIKE_ASM = 3
-+__GNUCLIKE_ASM = 2
-+__GNUCLIKE___TYPEOF = 1
-+__GNUCLIKE___OFFSETOF = 1
-+__GNUCLIKE___SECTION = 1
-+__GNUCLIKE_ATTRIBUTE_MODE_DI = 1
-+__GNUCLIKE_CTOR_SECTION_HANDLING = 1
-+__GNUCLIKE_BUILTIN_CONSTANT_P = 1
-+__GNUCLIKE_BUILTIN_VARARGS = 1
-+__GNUCLIKE_BUILTIN_STDARG = 1
-+__GNUCLIKE_BUILTIN_VAALIST = 1
-+__GNUC_VA_LIST_COMPATIBILITY = 1
-+__GNUCLIKE_BUILTIN_NEXT_ARG = 1
-+__GNUCLIKE_BUILTIN_MEMCPY = 1
-+__CC_SUPPORTS_INLINE = 1
-+__CC_SUPPORTS___INLINE = 1
-+__CC_SUPPORTS___INLINE__ = 1
-+__CC_SUPPORTS___FUNC__ = 1
-+__CC_SUPPORTS_WARNING = 1
-+__CC_SUPPORTS_VARADIC_XXX = 1
-+__CC_SUPPORTS_DYNAMIC_ARRAY_INIT = 1
-+__CC_INT_IS_32BIT = 1
- def __P(protos): return protos
- 
- def __STRING(x): return #x
-@@ -29,6 +51,8 @@
- 
- def __predict_false(exp): return (exp)
- 
-+def __format_arg(fmtarg): return __attribute__((__format_arg__ (fmtarg)))
-+
- def __FBSDID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s)
- 
- def __RCSID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s)
-@@ -86,8 +110,6 @@
- BIG_ENDIAN = _BIG_ENDIAN
- PDP_ENDIAN = _PDP_ENDIAN
- BYTE_ORDER = _BYTE_ORDER
--__INTEL_COMPILER_with_FreeBSD_endian = 1
--__INTEL_COMPILER_with_FreeBSD_endian = 1
- def __word_swap_int_var(x): return \
- 
- def __word_swap_int_const(x): return \
-@@ -96,12 +118,16 @@
- 
- def __byte_swap_int_var(x): return \
- 
--def __byte_swap_int_var(x): return \
--
- def __byte_swap_int_const(x): return \
- 
- def __byte_swap_int(x): return __byte_swap_int_var(x)
- 
-+def __byte_swap_long_var(x): return \
-+
-+def __byte_swap_long_const(x): return \
-+
-+def __byte_swap_long(x): return __byte_swap_long_var(x)
-+
- def __byte_swap_word_var(x): return \
- 
- def __byte_swap_word_const(x): return \
-@@ -229,47 +255,50 @@
- IPPROTO_APES = 99
- IPPROTO_GMTP = 100
- IPPROTO_IPCOMP = 108
-+IPPROTO_SCTP = 132
- IPPROTO_PIM = 103
-+IPPROTO_CARP = 112
- IPPROTO_PGM = 113
- IPPROTO_PFSYNC = 240
- IPPROTO_OLD_DIVERT = 254
- IPPROTO_MAX = 256
- IPPROTO_DONE = 257
- IPPROTO_DIVERT = 258
-+IPPROTO_SPACER = 32767
- IPPORT_RESERVED = 1024
- IPPORT_HIFIRSTAUTO = 49152
- IPPORT_HILASTAUTO = 65535
- IPPORT_RESERVEDSTART = 600
- IPPORT_MAX = 65535
--def IN_CLASSA(i): return (((u_int32_t)(i) & (-2147483648)) == 0)
-+def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0)
- 
--IN_CLASSA_NET = (-16777216)
-+IN_CLASSA_NET = 0xff000000
- IN_CLASSA_NSHIFT = 24
- IN_CLASSA_HOST = 0x00ffffff
- IN_CLASSA_MAX = 128
--def IN_CLASSB(i): return (((u_int32_t)(i) & (-1073741824)) == (-2147483648))
-+def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000)
- 
--IN_CLASSB_NET = (-65536)
-+IN_CLASSB_NET = 0xffff0000
- IN_CLASSB_NSHIFT = 16
- IN_CLASSB_HOST = 0x0000ffff
- IN_CLASSB_MAX = 65536
--def IN_CLASSC(i): return (((u_int32_t)(i) & (-536870912)) == (-1073741824))
-+def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000)
- 
--IN_CLASSC_NET = (-256)
-+IN_CLASSC_NET = 0xffffff00
- IN_CLASSC_NSHIFT = 8
- IN_CLASSC_HOST = 0x000000ff
--def IN_CLASSD(i): return (((u_int32_t)(i) & (-268435456)) == (-536870912))
-+def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000)
- 
--IN_CLASSD_NET = (-268435456)
-+IN_CLASSD_NET = 0xf0000000
- IN_CLASSD_NSHIFT = 28
- IN_CLASSD_HOST = 0x0fffffff
- def IN_MULTICAST(i): return IN_CLASSD(i)
- 
--def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456))
-+def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
- 
--def IN_BADCLASS(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456))
-+def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
- 
--INADDR_NONE = (-1)
-+INADDR_NONE = 0xffffffff
- IN_LOOPBACKNET = 127
- IP_OPTIONS = 1
- IP_HDRINCL = 2
-@@ -311,6 +340,8 @@
- IP_DUMMYNET_FLUSH = 62
- IP_DUMMYNET_GET = 64
- IP_RECVTTL = 65
-+IP_MINTTL = 66
-+IP_DONTFRAG = 67
- IP_DEFAULT_MULTICAST_TTL = 1
- IP_DEFAULT_MULTICAST_LOOP = 1
- IP_MAX_MEMBERSHIPS = 20
-@@ -339,7 +370,7 @@
- 
- 
- # Included from netinet6/in6.h
--__KAME_VERSION = "20010528/FreeBSD"
-+__KAME_VERSION = "FreeBSD"
- IPV6PORT_RESERVED = 1024
- IPV6PORT_ANONMIN = 49152
- IPV6PORT_ANONMAX = 65535
-@@ -348,8 +379,8 @@
- INET6_ADDRSTRLEN = 46
- IPV6_ADDR_INT32_ONE = 1
- IPV6_ADDR_INT32_TWO = 2
--IPV6_ADDR_INT32_MNL = (-16711680)
--IPV6_ADDR_INT32_MLL = (-16646144)
-+IPV6_ADDR_INT32_MNL = 0xff010000
-+IPV6_ADDR_INT32_MLL = 0xff020000
- IPV6_ADDR_INT32_SMP = 0x0000ffff
- IPV6_ADDR_INT16_ULL = 0xfe80
- IPV6_ADDR_INT16_USL = 0xfec0
-@@ -358,7 +389,7 @@
- IPV6_ADDR_INT32_TWO = 0x02000000
- IPV6_ADDR_INT32_MNL = 0x000001ff
- IPV6_ADDR_INT32_MLL = 0x000002ff
--IPV6_ADDR_INT32_SMP = (-65536)
-+IPV6_ADDR_INT32_SMP = 0xffff0000
- IPV6_ADDR_INT16_ULL = 0x80fe
- IPV6_ADDR_INT16_USL = 0xc0fe
- IPV6_ADDR_INT16_MLL = 0x02ff
-@@ -511,5 +542,10 @@
- IPV6CTL_RIP6STATS = 36
- IPV6CTL_PREFER_TEMPADDR = 37
- IPV6CTL_ADDRCTLPOLICY = 38
-+IPV6CTL_USE_DEFAULTZONE = 39
- IPV6CTL_MAXFRAGS = 41
--IPV6CTL_MAXID = 42
-+IPV6CTL_IFQ = 42
-+IPV6CTL_ISATAPRTR = 43
-+IPV6CTL_MCAST_PMTU = 44
-+IPV6CTL_STEALTH = 45
-+IPV6CTL_MAXID = 46
-Index: Lib/plat-freebsd7/IN.py
-===================================================================
---- Lib/plat-freebsd7/IN.py	(revision 58696)
-+++ Lib/plat-freebsd7/IN.py	(revision 58697)
-@@ -10,9 +10,9 @@
- __GNUCLIKE_CTOR_SECTION_HANDLING = 1
- __GNUCLIKE_BUILTIN_CONSTANT_P = 1
- __GNUCLIKE_BUILTIN_VARARGS = 1
-+__GNUCLIKE_BUILTIN_STDARG = 1
- __GNUCLIKE_BUILTIN_VAALIST = 1
- __GNUC_VA_LIST_COMPATIBILITY = 1
--__GNUCLIKE_BUILTIN_STDARG = 1
- __GNUCLIKE_BUILTIN_NEXT_ARG = 1
- __GNUCLIKE_BUILTIN_MEMCPY = 1
- __CC_SUPPORTS_INLINE = 1
-@@ -51,6 +51,8 @@
- 
- def __predict_false(exp): return (exp)
- 
-+def __format_arg(fmtarg): return __attribute__((__format_arg__ (fmtarg)))
-+
- def __FBSDID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s)
- 
- def __RCSID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s)
-@@ -247,6 +249,7 @@
- IPPROTO_APES = 99
- IPPROTO_GMTP = 100
- IPPROTO_IPCOMP = 108
-+IPPROTO_SCTP = 132
- IPPROTO_PIM = 103
- IPPROTO_CARP = 112
- IPPROTO_PGM = 113
-@@ -289,6 +292,10 @@
- 
- def IN_BADCLASS(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456))
- 
-+def IN_LINKLOCAL(i): return (((u_int32_t)(i) & (-65536)) == (-1442971648))
-+
-+def IN_LOCAL_GROUP(i): return (((u_int32_t)(i) & (-256)) == (-536870912))
-+
- INADDR_NONE = (-1)
- IN_LOOPBACKNET = 127
- IP_OPTIONS = 1
-@@ -326,14 +333,35 @@
- IP_FW_ZERO = 53
- IP_FW_GET = 54
- IP_FW_RESETLOG = 55
-+IP_FW_NAT_CFG = 56
-+IP_FW_NAT_DEL = 57
-+IP_FW_NAT_GET_CONFIG = 58
-+IP_FW_NAT_GET_LOG = 59
- IP_DUMMYNET_CONFIGURE = 60
- IP_DUMMYNET_DEL = 61
- IP_DUMMYNET_FLUSH = 62
- IP_DUMMYNET_GET = 64
- IP_RECVTTL = 65
-+IP_MINTTL = 66
-+IP_DONTFRAG = 67
-+IP_ADD_SOURCE_MEMBERSHIP = 70
-+IP_DROP_SOURCE_MEMBERSHIP = 71
-+IP_BLOCK_SOURCE = 72
-+IP_UNBLOCK_SOURCE = 73
-+IP_MSFILTER = 74
-+MCAST_JOIN_GROUP = 80
-+MCAST_LEAVE_GROUP = 81
-+MCAST_JOIN_SOURCE_GROUP = 82
-+MCAST_LEAVE_SOURCE_GROUP = 83
-+MCAST_BLOCK_SOURCE = 84
-+MCAST_UNBLOCK_SOURCE = 85
- IP_DEFAULT_MULTICAST_TTL = 1
- IP_DEFAULT_MULTICAST_LOOP = 1
--IP_MAX_MEMBERSHIPS = 20
-+IP_MIN_MEMBERSHIPS = 31
-+IP_MAX_MEMBERSHIPS = 4095
-+IP_MAX_SOURCE_FILTER = 1024
-+MCAST_INCLUDE = 1
-+MCAST_EXCLUDE = 2
- IP_PORTRANGE_DEFAULT = 0
- IP_PORTRANGE_HIGH = 1
- IP_PORTRANGE_LOW = 2
-@@ -359,7 +387,7 @@
- 
- 
- # Included from netinet6/in6.h
--__KAME_VERSION = "20010528/FreeBSD"
-+__KAME_VERSION = "FreeBSD"
- IPV6PORT_RESERVED = 1024
- IPV6PORT_ANONMIN = 49152
- IPV6PORT_ANONMAX = 65535
-@@ -430,6 +458,8 @@
- 
- def IN6_IS_SCOPE_LINKLOCAL(a): return \
- 
-+def IN6_IS_SCOPE_EMBED(a): return \
-+
- def IFA6_IS_DEPRECATED(a): return \
- 
- def IFA6_IS_INVALID(a): return \
-@@ -488,6 +518,7 @@
- IPV6_TCLASS = 61
- IPV6_DONTFRAG = 62
- IPV6_PREFER_TEMPADDR = 63
-+IPV6_MSFILTER = 74
- IPV6_RTHDR_LOOSE = 0
- IPV6_RTHDR_STRICT = 1
- IPV6_RTHDR_TYPE_0 = 0
-@@ -531,5 +562,10 @@
- IPV6CTL_RIP6STATS = 36
- IPV6CTL_PREFER_TEMPADDR = 37
- IPV6CTL_ADDRCTLPOLICY = 38
-+IPV6CTL_USE_DEFAULTZONE = 39
- IPV6CTL_MAXFRAGS = 41
--IPV6CTL_MAXID = 42
-+IPV6CTL_IFQ = 42
-+IPV6CTL_ISATAPRTR = 43
-+IPV6CTL_MCAST_PMTU = 44
-+IPV6CTL_STEALTH = 45
-+IPV6CTL_MAXID = 46
-Index: Lib/plat-freebsd8/regen
-===================================================================
---- Lib/plat-freebsd8/regen	(revision 0)
-+++ Lib/plat-freebsd8/regen	(revision 58697)
-@@ -0,0 +1,3 @@
-+#! /bin/sh
-+set -v
-+python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
-Index: Lib/plat-freebsd8/IN.py
-===================================================================
---- Lib/plat-freebsd8/IN.py	(revision 0)
-+++ Lib/plat-freebsd8/IN.py	(revision 58697)
-@@ -0,0 +1,571 @@
-+# Generated by h2py from /usr/include/netinet/in.h
-+
-+# Included from sys/cdefs.h
-+__GNUCLIKE_ASM = 3
-+__GNUCLIKE_ASM = 2
-+__GNUCLIKE___TYPEOF = 1
-+__GNUCLIKE___OFFSETOF = 1
-+__GNUCLIKE___SECTION = 1
-+__GNUCLIKE_ATTRIBUTE_MODE_DI = 1
-+__GNUCLIKE_CTOR_SECTION_HANDLING = 1
-+__GNUCLIKE_BUILTIN_CONSTANT_P = 1
-+__GNUCLIKE_BUILTIN_VARARGS = 1
-+__GNUCLIKE_BUILTIN_STDARG = 1
-+__GNUCLIKE_BUILTIN_VAALIST = 1
-+__GNUC_VA_LIST_COMPATIBILITY = 1
-+__GNUCLIKE_BUILTIN_NEXT_ARG = 1
-+__GNUCLIKE_BUILTIN_MEMCPY = 1
-+__CC_SUPPORTS_INLINE = 1
-+__CC_SUPPORTS___INLINE = 1
-+__CC_SUPPORTS___INLINE__ = 1
-+__CC_SUPPORTS___FUNC__ = 1
-+__CC_SUPPORTS_WARNING = 1
-+__CC_SUPPORTS_VARADIC_XXX = 1
-+__CC_SUPPORTS_DYNAMIC_ARRAY_INIT = 1
-+__CC_INT_IS_32BIT = 1
-+def __P(protos): return protos
-+
-+def __STRING(x): return #x
-+
-+def __XSTRING(x): return __STRING(x)
-+
-+def __P(protos): return ()
-+
-+def __STRING(x): return "x"
-+
-+def __aligned(x): return __attribute__((__aligned__(x)))
-+
-+def __section(x): return __attribute__((__section__(x)))
-+
-+def __aligned(x): return __attribute__((__aligned__(x)))
-+
-+def __section(x): return __attribute__((__section__(x)))
-+
-+def __nonnull(x): return __attribute__((__nonnull__(x)))
-+
-+def __predict_true(exp): return __builtin_expect((exp), 1)
-+
-+def __predict_false(exp): return __builtin_expect((exp), 0)
-+
-+def __predict_true(exp): return (exp)
-+
-+def __predict_false(exp): return (exp)
-+
-+def __format_arg(fmtarg): return __attribute__((__format_arg__ (fmtarg)))
-+
-+def __FBSDID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s)
-+
-+def __RCSID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s)
-+
-+def __RCSID_SOURCE(s): return __IDSTRING(__CONCAT(__rcsid_source_,__LINE__),s)
-+
-+def __SCCSID(s): return __IDSTRING(__CONCAT(__sccsid_,__LINE__),s)
-+
-+def __COPYRIGHT(s): return __IDSTRING(__CONCAT(__copyright_,__LINE__),s)
-+
-+_POSIX_C_SOURCE = 199009
-+_POSIX_C_SOURCE = 199209
-+__XSI_VISIBLE = 600
-+_POSIX_C_SOURCE = 200112
-+__XSI_VISIBLE = 500
-+_POSIX_C_SOURCE = 199506
-+_POSIX_C_SOURCE = 198808
-+__POSIX_VISIBLE = 200112
-+__ISO_C_VISIBLE = 1999
-+__POSIX_VISIBLE = 199506
-+__ISO_C_VISIBLE = 1990
-+__POSIX_VISIBLE = 199309
-+__ISO_C_VISIBLE = 1990
-+__POSIX_VISIBLE = 199209
-+__ISO_C_VISIBLE = 1990
-+__POSIX_VISIBLE = 199009
-+__ISO_C_VISIBLE = 1990
-+__POSIX_VISIBLE = 198808
-+__ISO_C_VISIBLE = 0
-+__POSIX_VISIBLE = 0
-+__XSI_VISIBLE = 0
-+__BSD_VISIBLE = 0
-+__ISO_C_VISIBLE = 1990
-+__POSIX_VISIBLE = 0
-+__XSI_VISIBLE = 0
-+__BSD_VISIBLE = 0
-+__ISO_C_VISIBLE = 1999
-+__POSIX_VISIBLE = 200112
-+__XSI_VISIBLE = 600
-+__BSD_VISIBLE = 1
-+__ISO_C_VISIBLE = 1999
-+
-+# Included from sys/_types.h
-+
-+# Included from machine/_types.h
-+
-+# Included from machine/endian.h
-+_QUAD_HIGHWORD = 1
-+_QUAD_LOWWORD = 0
-+_LITTLE_ENDIAN = 1234
-+_BIG_ENDIAN = 4321
-+_PDP_ENDIAN = 3412
-+_BYTE_ORDER = _LITTLE_ENDIAN
-+LITTLE_ENDIAN = _LITTLE_ENDIAN
-+BIG_ENDIAN = _BIG_ENDIAN
-+PDP_ENDIAN = _PDP_ENDIAN
-+BYTE_ORDER = _BYTE_ORDER
-+def __word_swap_int_var(x): return \
-+
-+def __word_swap_int_const(x): return \
-+
-+def __word_swap_int(x): return __word_swap_int_var(x)
-+
-+def __byte_swap_int_var(x): return \
-+
-+def __byte_swap_int_const(x): return \
-+
-+def __byte_swap_int(x): return __byte_swap_int_var(x)
-+
-+def __byte_swap_word_var(x): return \
-+
-+def __byte_swap_word_const(x): return \
-+
-+def __byte_swap_word(x): return __byte_swap_word_var(x)
-+
-+def __htonl(x): return __bswap32(x)
-+
-+def __htons(x): return __bswap16(x)
-+
-+def __ntohl(x): return __bswap32(x)
-+
-+def __ntohs(x): return __bswap16(x)
-+
-+IPPROTO_IP = 0
-+IPPROTO_ICMP = 1
-+IPPROTO_TCP = 6
-+IPPROTO_UDP = 17
-+def htonl(x): return __htonl(x)
-+
-+def htons(x): return __htons(x)
-+
-+def ntohl(x): return __ntohl(x)
-+
-+def ntohs(x): return __ntohs(x)
-+
-+IPPROTO_RAW = 255
-+INET_ADDRSTRLEN = 16
-+IPPROTO_HOPOPTS = 0
-+IPPROTO_IGMP = 2
-+IPPROTO_GGP = 3
-+IPPROTO_IPV4 = 4
-+IPPROTO_IPIP = IPPROTO_IPV4
-+IPPROTO_ST = 7
-+IPPROTO_EGP = 8
-+IPPROTO_PIGP = 9
-+IPPROTO_RCCMON = 10
-+IPPROTO_NVPII = 11
-+IPPROTO_PUP = 12
-+IPPROTO_ARGUS = 13
-+IPPROTO_EMCON = 14
-+IPPROTO_XNET = 15
-+IPPROTO_CHAOS = 16
-+IPPROTO_MUX = 18
-+IPPROTO_MEAS = 19
-+IPPROTO_HMP = 20
-+IPPROTO_PRM = 21
-+IPPROTO_IDP = 22
-+IPPROTO_TRUNK1 = 23
-+IPPROTO_TRUNK2 = 24
-+IPPROTO_LEAF1 = 25
-+IPPROTO_LEAF2 = 26
-+IPPROTO_RDP = 27
-+IPPROTO_IRTP = 28
-+IPPROTO_TP = 29
-+IPPROTO_BLT = 30
-+IPPROTO_NSP = 31
-+IPPROTO_INP = 32
-+IPPROTO_SEP = 33
-+IPPROTO_3PC = 34
-+IPPROTO_IDPR = 35
-+IPPROTO_XTP = 36
-+IPPROTO_DDP = 37
-+IPPROTO_CMTP = 38
-+IPPROTO_TPXX = 39
-+IPPROTO_IL = 40
-+IPPROTO_IPV6 = 41
-+IPPROTO_SDRP = 42
-+IPPROTO_ROUTING = 43
-+IPPROTO_FRAGMENT = 44
-+IPPROTO_IDRP = 45
-+IPPROTO_RSVP = 46
-+IPPROTO_GRE = 47
-+IPPROTO_MHRP = 48
-+IPPROTO_BHA = 49
-+IPPROTO_ESP = 50
-+IPPROTO_AH = 51
-+IPPROTO_INLSP = 52
-+IPPROTO_SWIPE = 53
-+IPPROTO_NHRP = 54
-+IPPROTO_MOBILE = 55
-+IPPROTO_TLSP = 56
-+IPPROTO_SKIP = 57
-+IPPROTO_ICMPV6 = 58
-+IPPROTO_NONE = 59
-+IPPROTO_DSTOPTS = 60
-+IPPROTO_AHIP = 61
-+IPPROTO_CFTP = 62
-+IPPROTO_HELLO = 63
-+IPPROTO_SATEXPAK = 64
-+IPPROTO_KRYPTOLAN = 65
-+IPPROTO_RVD = 66
-+IPPROTO_IPPC = 67
-+IPPROTO_ADFS = 68
-+IPPROTO_SATMON = 69
-+IPPROTO_VISA = 70
-+IPPROTO_IPCV = 71
-+IPPROTO_CPNX = 72
-+IPPROTO_CPHB = 73
-+IPPROTO_WSN = 74
-+IPPROTO_PVP = 75
-+IPPROTO_BRSATMON = 76
-+IPPROTO_ND = 77
-+IPPROTO_WBMON = 78
-+IPPROTO_WBEXPAK = 79
-+IPPROTO_EON = 80
-+IPPROTO_VMTP = 81
-+IPPROTO_SVMTP = 82
-+IPPROTO_VINES = 83
-+IPPROTO_TTP = 84
-+IPPROTO_IGP = 85
-+IPPROTO_DGP = 86
-+IPPROTO_TCF = 87
-+IPPROTO_IGRP = 88
-+IPPROTO_OSPFIGP = 89
-+IPPROTO_SRPC = 90
-+IPPROTO_LARP = 91
-+IPPROTO_MTP = 92
-+IPPROTO_AX25 = 93
-+IPPROTO_IPEIP = 94
-+IPPROTO_MICP = 95
-+IPPROTO_SCCSP = 96
-+IPPROTO_ETHERIP = 97
-+IPPROTO_ENCAP = 98
-+IPPROTO_APES = 99
-+IPPROTO_GMTP = 100
-+IPPROTO_IPCOMP = 108
-+IPPROTO_SCTP = 132
-+IPPROTO_PIM = 103
-+IPPROTO_CARP = 112
-+IPPROTO_PGM = 113
-+IPPROTO_PFSYNC = 240
-+IPPROTO_OLD_DIVERT = 254
-+IPPROTO_MAX = 256
-+IPPROTO_DONE = 257
-+IPPROTO_DIVERT = 258
-+IPPROTO_SPACER = 32767
-+IPPORT_RESERVED = 1024
-+IPPORT_HIFIRSTAUTO = 49152
-+IPPORT_HILASTAUTO = 65535
-+IPPORT_RESERVEDSTART = 600
-+IPPORT_MAX = 65535
-+def IN_CLASSA(i): return (((u_int32_t)(i) & (-2147483648)) == 0)
-+
-+IN_CLASSA_NET = (-16777216)
-+IN_CLASSA_NSHIFT = 24
-+IN_CLASSA_HOST = 0x00ffffff
-+IN_CLASSA_MAX = 128
-+def IN_CLASSB(i): return (((u_int32_t)(i) & (-1073741824)) == (-2147483648))
-+
-+IN_CLASSB_NET = (-65536)
-+IN_CLASSB_NSHIFT = 16
-+IN_CLASSB_HOST = 0x0000ffff
-+IN_CLASSB_MAX = 65536
-+def IN_CLASSC(i): return (((u_int32_t)(i) & (-536870912)) == (-1073741824))
-+
-+IN_CLASSC_NET = (-256)
-+IN_CLASSC_NSHIFT = 8
-+IN_CLASSC_HOST = 0x000000ff
-+def IN_CLASSD(i): return (((u_int32_t)(i) & (-268435456)) == (-536870912))
-+
-+IN_CLASSD_NET = (-268435456)
-+IN_CLASSD_NSHIFT = 28
-+IN_CLASSD_HOST = 0x0fffffff
-+def IN_MULTICAST(i): return IN_CLASSD(i)
-+
-+def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456))
-+
-+def IN_BADCLASS(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456))
-+
-+def IN_LINKLOCAL(i): return (((u_int32_t)(i) & (-65536)) == (-1442971648))
-+
-+def IN_LOCAL_GROUP(i): return (((u_int32_t)(i) & (-256)) == (-536870912))
-+
-+INADDR_NONE = (-1)
-+IN_LOOPBACKNET = 127
-+IP_OPTIONS = 1
-+IP_HDRINCL = 2
-+IP_TOS = 3
-+IP_TTL = 4
-+IP_RECVOPTS = 5
-+IP_RECVRETOPTS = 6
-+IP_RECVDSTADDR = 7
-+IP_SENDSRCADDR = IP_RECVDSTADDR
-+IP_RETOPTS = 8
-+IP_MULTICAST_IF = 9
-+IP_MULTICAST_TTL = 10
-+IP_MULTICAST_LOOP = 11
-+IP_ADD_MEMBERSHIP = 12
-+IP_DROP_MEMBERSHIP = 13
-+IP_MULTICAST_VIF = 14
-+IP_RSVP_ON = 15
-+IP_RSVP_OFF = 16
-+IP_RSVP_VIF_ON = 17
-+IP_RSVP_VIF_OFF = 18
-+IP_PORTRANGE = 19
-+IP_RECVIF = 20
-+IP_IPSEC_POLICY = 21
-+IP_FAITH = 22
-+IP_ONESBCAST = 23
-+IP_FW_TABLE_ADD = 40
-+IP_FW_TABLE_DEL = 41
-+IP_FW_TABLE_FLUSH = 42
-+IP_FW_TABLE_GETSIZE = 43
-+IP_FW_TABLE_LIST = 44
-+IP_FW_ADD = 50
-+IP_FW_DEL = 51
-+IP_FW_FLUSH = 52
-+IP_FW_ZERO = 53
-+IP_FW_GET = 54
-+IP_FW_RESETLOG = 55
-+IP_FW_NAT_CFG = 56
-+IP_FW_NAT_DEL = 57
-+IP_FW_NAT_GET_CONFIG = 58
-+IP_FW_NAT_GET_LOG = 59
-+IP_DUMMYNET_CONFIGURE = 60
-+IP_DUMMYNET_DEL = 61
-+IP_DUMMYNET_FLUSH = 62
-+IP_DUMMYNET_GET = 64
-+IP_RECVTTL = 65
-+IP_MINTTL = 66
-+IP_DONTFRAG = 67
-+IP_ADD_SOURCE_MEMBERSHIP = 70
-+IP_DROP_SOURCE_MEMBERSHIP = 71
-+IP_BLOCK_SOURCE = 72
-+IP_UNBLOCK_SOURCE = 73
-+IP_MSFILTER = 74
-+MCAST_JOIN_GROUP = 80
-+MCAST_LEAVE_GROUP = 81
-+MCAST_JOIN_SOURCE_GROUP = 82
-+MCAST_LEAVE_SOURCE_GROUP = 83
-+MCAST_BLOCK_SOURCE = 84
-+MCAST_UNBLOCK_SOURCE = 85
-+IP_DEFAULT_MULTICAST_TTL = 1
-+IP_DEFAULT_MULTICAST_LOOP = 1
-+IP_MIN_MEMBERSHIPS = 31
-+IP_MAX_MEMBERSHIPS = 4095
-+IP_MAX_SOURCE_FILTER = 1024
-+MCAST_INCLUDE = 1
-+MCAST_EXCLUDE = 2
-+IP_PORTRANGE_DEFAULT = 0
-+IP_PORTRANGE_HIGH = 1
-+IP_PORTRANGE_LOW = 2
-+IPPROTO_MAXID = (IPPROTO_AH + 1)
-+IPCTL_FORWARDING = 1
-+IPCTL_SENDREDIRECTS = 2
-+IPCTL_DEFTTL = 3
-+IPCTL_DEFMTU = 4
-+IPCTL_RTEXPIRE = 5
-+IPCTL_RTMINEXPIRE = 6
-+IPCTL_RTMAXCACHE = 7
-+IPCTL_SOURCEROUTE = 8
-+IPCTL_DIRECTEDBROADCAST = 9
-+IPCTL_INTRQMAXLEN = 10
-+IPCTL_INTRQDROPS = 11
-+IPCTL_STATS = 12
-+IPCTL_ACCEPTSOURCEROUTE = 13
-+IPCTL_FASTFORWARDING = 14
-+IPCTL_KEEPFAITH = 15
-+IPCTL_GIF_TTL = 16
-+IPCTL_MAXID = 17
-+def in_nullhost(x): return ((x).s_addr == INADDR_ANY)
-+
-+
-+# Included from netinet6/in6.h
-+__KAME_VERSION = "FreeBSD"
-+IPV6PORT_RESERVED = 1024
-+IPV6PORT_ANONMIN = 49152
-+IPV6PORT_ANONMAX = 65535
-+IPV6PORT_RESERVEDMIN = 600
-+IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1)
-+INET6_ADDRSTRLEN = 46
-+IPV6_ADDR_INT32_ONE = 1
-+IPV6_ADDR_INT32_TWO = 2
-+IPV6_ADDR_INT32_MNL = (-16711680)
-+IPV6_ADDR_INT32_MLL = (-16646144)
-+IPV6_ADDR_INT32_SMP = 0x0000ffff
-+IPV6_ADDR_INT16_ULL = 0xfe80
-+IPV6_ADDR_INT16_USL = 0xfec0
-+IPV6_ADDR_INT16_MLL = 0xff02
-+IPV6_ADDR_INT32_ONE = 0x01000000
-+IPV6_ADDR_INT32_TWO = 0x02000000
-+IPV6_ADDR_INT32_MNL = 0x000001ff
-+IPV6_ADDR_INT32_MLL = 0x000002ff
-+IPV6_ADDR_INT32_SMP = (-65536)
-+IPV6_ADDR_INT16_ULL = 0x80fe
-+IPV6_ADDR_INT16_USL = 0xc0fe
-+IPV6_ADDR_INT16_MLL = 0x02ff
-+def IN6_IS_ADDR_UNSPECIFIED(a): return \
-+
-+def IN6_IS_ADDR_LOOPBACK(a): return \
-+
-+def IN6_IS_ADDR_V4COMPAT(a): return \
-+
-+def IN6_IS_ADDR_V4MAPPED(a): return \
-+
-+IPV6_ADDR_SCOPE_NODELOCAL = 0x01
-+IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01
-+IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
-+IPV6_ADDR_SCOPE_SITELOCAL = 0x05
-+IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
-+IPV6_ADDR_SCOPE_GLOBAL = 0x0e
-+__IPV6_ADDR_SCOPE_NODELOCAL = 0x01
-+__IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01
-+__IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
-+__IPV6_ADDR_SCOPE_SITELOCAL = 0x05
-+__IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
-+__IPV6_ADDR_SCOPE_GLOBAL = 0x0e
-+def IN6_IS_ADDR_LINKLOCAL(a): return \
-+
-+def IN6_IS_ADDR_SITELOCAL(a): return \
-+
-+def IN6_IS_ADDR_MC_NODELOCAL(a): return \
-+
-+def IN6_IS_ADDR_MC_INTFACELOCAL(a): return \
-+
-+def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
-+
-+def IN6_IS_ADDR_MC_SITELOCAL(a): return \
-+
-+def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
-+
-+def IN6_IS_ADDR_MC_GLOBAL(a): return \
-+
-+def IN6_IS_ADDR_MC_NODELOCAL(a): return \
-+
-+def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
-+
-+def IN6_IS_ADDR_MC_SITELOCAL(a): return \
-+
-+def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
-+
-+def IN6_IS_ADDR_MC_GLOBAL(a): return \
-+
-+def IN6_IS_SCOPE_LINKLOCAL(a): return \
-+
-+def IN6_IS_SCOPE_EMBED(a): return \
-+
-+def IFA6_IS_DEPRECATED(a): return \
-+
-+def IFA6_IS_INVALID(a): return \
-+
-+IPV6_OPTIONS = 1
-+IPV6_RECVOPTS = 5
-+IPV6_RECVRETOPTS = 6
-+IPV6_RECVDSTADDR = 7
-+IPV6_RETOPTS = 8
-+IPV6_SOCKOPT_RESERVED1 = 3
-+IPV6_UNICAST_HOPS = 4
-+IPV6_MULTICAST_IF = 9
-+IPV6_MULTICAST_HOPS = 10
-+IPV6_MULTICAST_LOOP = 11
-+IPV6_JOIN_GROUP = 12
-+IPV6_LEAVE_GROUP = 13
-+IPV6_PORTRANGE = 14
-+ICMP6_FILTER = 18
-+IPV6_2292PKTINFO = 19
-+IPV6_2292HOPLIMIT = 20
-+IPV6_2292NEXTHOP = 21
-+IPV6_2292HOPOPTS = 22
-+IPV6_2292DSTOPTS = 23
-+IPV6_2292RTHDR = 24
-+IPV6_2292PKTOPTIONS = 25
-+IPV6_CHECKSUM = 26
-+IPV6_V6ONLY = 27
-+IPV6_BINDV6ONLY = IPV6_V6ONLY
-+IPV6_IPSEC_POLICY = 28
-+IPV6_FAITH = 29
-+IPV6_FW_ADD = 30
-+IPV6_FW_DEL = 31
-+IPV6_FW_FLUSH = 32
-+IPV6_FW_ZERO = 33
-+IPV6_FW_GET = 34
-+IPV6_RTHDRDSTOPTS = 35
-+IPV6_RECVPKTINFO = 36
-+IPV6_RECVHOPLIMIT = 37
-+IPV6_RECVRTHDR = 38
-+IPV6_RECVHOPOPTS = 39
-+IPV6_RECVDSTOPTS = 40
-+IPV6_RECVRTHDRDSTOPTS = 41
-+IPV6_USE_MIN_MTU = 42
-+IPV6_RECVPATHMTU = 43
-+IPV6_PATHMTU = 44
-+IPV6_REACHCONF = 45
-+IPV6_PKTINFO = 46
-+IPV6_HOPLIMIT = 47
-+IPV6_NEXTHOP = 48
-+IPV6_HOPOPTS = 49
-+IPV6_DSTOPTS = 50
-+IPV6_RTHDR = 51
-+IPV6_PKTOPTIONS = 52
-+IPV6_RECVTCLASS = 57
-+IPV6_AUTOFLOWLABEL = 59
-+IPV6_TCLASS = 61
-+IPV6_DONTFRAG = 62
-+IPV6_PREFER_TEMPADDR = 63
-+IPV6_MSFILTER = 74
-+IPV6_RTHDR_LOOSE = 0
-+IPV6_RTHDR_STRICT = 1
-+IPV6_RTHDR_TYPE_0 = 0
-+IPV6_DEFAULT_MULTICAST_HOPS = 1
-+IPV6_DEFAULT_MULTICAST_LOOP = 1
-+IPV6_PORTRANGE_DEFAULT = 0
-+IPV6_PORTRANGE_HIGH = 1
-+IPV6_PORTRANGE_LOW = 2
-+IPV6PROTO_MAXID = (IPPROTO_PIM + 1)
-+IPV6CTL_FORWARDING = 1
-+IPV6CTL_SENDREDIRECTS = 2
-+IPV6CTL_DEFHLIM = 3
-+IPV6CTL_DEFMTU = 4
-+IPV6CTL_FORWSRCRT = 5
-+IPV6CTL_STATS = 6
-+IPV6CTL_MRTSTATS = 7
-+IPV6CTL_MRTPROTO = 8
-+IPV6CTL_MAXFRAGPACKETS = 9
-+IPV6CTL_SOURCECHECK = 10
-+IPV6CTL_SOURCECHECK_LOGINT = 11
-+IPV6CTL_ACCEPT_RTADV = 12
-+IPV6CTL_KEEPFAITH = 13
-+IPV6CTL_LOG_INTERVAL = 14
-+IPV6CTL_HDRNESTLIMIT = 15
-+IPV6CTL_DAD_COUNT = 16
-+IPV6CTL_AUTO_FLOWLABEL = 17
-+IPV6CTL_DEFMCASTHLIM = 18
-+IPV6CTL_GIF_HLIM = 19
-+IPV6CTL_KAME_VERSION = 20
-+IPV6CTL_USE_DEPRECATED = 21
-+IPV6CTL_RR_PRUNE = 22
-+IPV6CTL_MAPPED_ADDR = 23
-+IPV6CTL_V6ONLY = 24
-+IPV6CTL_RTEXPIRE = 25
-+IPV6CTL_RTMINEXPIRE = 26
-+IPV6CTL_RTMAXCACHE = 27
-+IPV6CTL_USETEMPADDR = 32
-+IPV6CTL_TEMPPLTIME = 33
-+IPV6CTL_TEMPVLTIME = 34
-+IPV6CTL_AUTO_LINKLOCAL = 35
-+IPV6CTL_RIP6STATS = 36
-+IPV6CTL_PREFER_TEMPADDR = 37
-+IPV6CTL_ADDRCTLPOLICY = 38
-+IPV6CTL_USE_DEFAULTZONE = 39
-+IPV6CTL_MAXFRAGS = 41
-+IPV6CTL_IFQ = 42
-+IPV6CTL_ISATAPRTR = 43
-+IPV6CTL_MCAST_PMTU = 44
-+IPV6CTL_STEALTH = 45
-+IPV6CTL_MAXID = 46
---- Lib/posixfile.py.orig	2005-07-17 11:36:59.000000000 +0900
-+++ Lib/posixfile.py	2007-10-28 21:41:27.000000000 +0900
-@@ -179,7 +179,7 @@
-         if sys.platform in ('netbsd1',
-                             'openbsd2',
-                             'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
--                            'freebsd6', 'freebsd7',
-+                            'freebsd6', 'freebsd7', 'freebsd8',
-                             'bsdos2', 'bsdos3', 'bsdos4'):
-             flock = struct.pack('lxxxxlxxxxlhh', \
-                   l_start, l_len, os.getpid(), l_type, l_whence)
---- Lib/test/regrtest.py.orig	2007-03-09 04:58:46.000000000 +0900
-+++ Lib/test/regrtest.py	2007-10-28 21:40:49.000000000 +0900
-@@ -1314,6 +1314,7 @@
- _expectations['freebsd5'] = _expectations['freebsd4']
- _expectations['freebsd6'] = _expectations['freebsd4']
- _expectations['freebsd7'] = _expectations['freebsd4']
-+_expectations['freebsd8'] = _expectations['freebsd4']
- 
- class _ExpectedSkips:
-     def __init__(self):
---- Lib/test/test_fcntl.py.orig	2006-09-05 11:54:42.000000000 +0900
-+++ Lib/test/test_fcntl.py	2007-10-28 21:41:12.000000000 +0900
-@@ -23,7 +23,7 @@
- if sys.platform in ('netbsd1', 'netbsd2', 'netbsd3',
-                     'Darwin1.2', 'darwin',
-                     'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
--                    'freebsd6', 'freebsd7',
-+                    'freebsd6', 'freebsd7', 'freebsd8',
-                     'bsdos2', 'bsdos3', 'bsdos4',
-                     'openbsd', 'openbsd2', 'openbsd3', 'openbsd4'):
-     if struct.calcsize('l') == 8:
---- Lib/test/test_socket.py.orig	2007-04-01 03:56:11.000000000 +0900
-+++ Lib/test/test_socket.py	2007-10-28 21:40:59.000000000 +0900
-@@ -316,7 +316,7 @@
-         # I've ordered this by protocols that have both a tcp and udp
-         # protocol, at least for modern Linuxes.
-         if sys.platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
--                            'freebsd7', 'darwin'):
-+                            'freebsd7', 'freebsd8', 'darwin'):
-             # avoid the 'echo' service on this platform, as there is an
-             # assumption breaking non-standard port/protocol entry
-             services = ('daytime', 'qotd', 'domain')
---- setup.py.orig	2007-10-28 20:38:55.000000000 +0900
-+++ setup.py	2007-10-28 21:40:05.000000000 +0900
-@@ -1045,7 +1045,7 @@
-             exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) )
- 
-         if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
--                        'freebsd7'):
-+                        'freebsd7', 'freebsd8'):
-             exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
- 
-         if platform == 'sunos5':
diff --git a/lang/python31/files/patch-lib-test_test_bigmem.py b/lang/python31/files/patch-lib-test_test_bigmem.py
deleted file mode 100644
index 5ec5935a046f..000000000000
--- a/lang/python31/files/patch-lib-test_test_bigmem.py
+++ /dev/null
@@ -1,163 +0,0 @@
---- Lib/test/test_bigmem.py.orig	2007-11-30 21:53:17.000000000 +0000
-+++ Lib/test/test_bigmem.py	2008-08-30 10:16:13.000000000 +0100
-@@ -1,5 +1,5 @@
- from test import test_support
--from test.test_support import bigmemtest, _1G, _2G
-+from test.test_support import bigmemtest, _1G, _2G, _4G, precisionbigmemtest
- 
- import unittest
- import operator
-@@ -54,6 +54,22 @@
-         self.assertEquals(s[lpadsize:-rpadsize], SUBSTR)
-         self.assertEquals(s.strip(), SUBSTR.strip())
- 
-+    @precisionbigmemtest(size=_2G - 1, memuse=1)
-+    def test_center_unicode(self, size):
-+        SUBSTR = u' abc def ghi'
-+        try:
-+            s = SUBSTR.center(size)
-+        except OverflowError:
-+            pass # acceptable on 32-bit
-+        else:
-+            self.assertEquals(len(s), size)
-+            lpadsize = rpadsize = (len(s) - len(SUBSTR)) // 2
-+            if len(s) % 2:
-+                lpadsize += 1
-+            self.assertEquals(s[lpadsize:-rpadsize], SUBSTR)
-+            self.assertEquals(s.strip(), SUBSTR.strip())
-+            del s
-+
-     @bigmemtest(minsize=_2G, memuse=2)
-     def test_count(self, size):
-         SUBSTR = ' abc def ghi'
-@@ -70,10 +86,44 @@
-         s = '.' * size
-         self.assertEquals(len(s.decode('utf-8')), size)
- 
-+    def basic_encode_test(self, size, enc, c=u'.', expectedsize=None):
-+        if expectedsize is None:
-+            expectedsize = size
-+
-+        s = c * size
-+        self.assertEquals(len(s.encode(enc)), expectedsize)
-+
-     @bigmemtest(minsize=_2G + 2, memuse=3)
-     def test_encode(self, size):
--        s = u'.' * size
--        self.assertEquals(len(s.encode('utf-8')), size)
-+        return self.basic_encode_test(size, 'utf-8')
-+
-+    @precisionbigmemtest(size=_4G / 6 + 2, memuse=2)
-+    def test_encode_raw_unicode_escape(self, size):
-+        try:
-+            return self.basic_encode_test(size, 'raw_unicode_escape')
-+        except MemoryError:
-+            pass # acceptable on 32-bit
-+
-+    @precisionbigmemtest(size=_4G / 5 + 70, memuse=3)
-+    def test_encode_utf7(self, size):
-+        try:
-+            return self.basic_encode_test(size, 'utf7')
-+        except MemoryError:
-+            pass # acceptable on 32-bit
-+
-+    @precisionbigmemtest(size=_2G-1, memuse=2)
-+    def test_decodeascii(self, size):
-+        return self.basic_encode_test(size, 'ascii', c='A')
-+
-+    @precisionbigmemtest(size=_4G / 5, memuse=6+2)
-+    def test_unicode_repr_oflw(self, size):
-+        try:
-+            s = u"\uAAAA"*size
-+            r = repr(s)
-+        except MemoryError:
-+            pass # acceptable on 32-bit
-+        else:
-+            self.failUnless(s == eval(r))
- 
-     @bigmemtest(minsize=_2G, memuse=2)
-     def test_endswith(self, size):
-@@ -459,6 +509,11 @@
-         self.assertEquals(s.count('\\'), size)
-         self.assertEquals(s.count('0'), size * 2)
- 
-+    @bigmemtest(minsize=2**32 / 5, memuse=6+2)
-+    def test_unicode_repr(self, size):
-+        s = u"\uAAAA" * size
-+        self.failUnless(len(repr(s)) > size)
-+
-     # This test is meaningful even with size < 2G, as long as the
-     # doubled string is > 2G (but it tests more if both are > 2G :)
-     @bigmemtest(minsize=_1G + 2, memuse=3)
-@@ -642,6 +697,35 @@
-     def test_repeat_large(self, size):
-         return self.basic_test_repeat(size)
- 
-+    @bigmemtest(minsize=_1G - 1, memuse=12)
-+    def test_repeat_large_2(self, size):
-+        return self.basic_test_repeat(size)
-+
-+    @precisionbigmemtest(size=_1G - 1, memuse=9)
-+    def test_from_2G_generator(self, size):
-+        try:
-+            t = tuple(xrange(size))
-+        except MemoryError:
-+            pass # acceptable on 32-bit
-+        else:
-+            count = 0
-+            for item in t:
-+                self.assertEquals(item, count)
-+                count += 1
-+            self.assertEquals(count, size)
-+
-+    @precisionbigmemtest(size=_1G - 25, memuse=9)
-+    def test_from_almost_2G_generator(self, size):
-+        try:
-+            t = tuple(xrange(size))
-+            count = 0
-+            for item in t:
-+                self.assertEquals(item, count)
-+                count += 1
-+            self.assertEquals(count, size)
-+        except MemoryError:
-+            pass # acceptable, expected on 32-bit
-+
-     # Like test_concat, split in two.
-     def basic_test_repr(self, size):
-         t = (0,) * size
-@@ -957,8 +1041,34 @@
-         self.assertEquals(l[:10], [1] * 10)
-         self.assertEquals(l[-10:], [5] * 10)
- 
-+class BufferTest(unittest.TestCase):
-+
-+    @precisionbigmemtest(size=_1G, memuse=4)
-+    def test_repeat(self, size):
-+        try:
-+            b = buffer("AAAA")*size
-+        except MemoryError:
-+            pass # acceptable on 32-bit
-+        else:
-+            count = 0
-+            for c in b:
-+                self.assertEquals(c, 'A')
-+                count += 1
-+            self.assertEquals(count, size*4)
-+
- def test_main():
--    test_support.run_unittest(StrTest, TupleTest, ListTest)
-+    test_support.run_unittest(StrTest, TupleTest, ListTest, BufferTest)
-+
-+# Expected failures (crashers)
-+# del StrTest.test_center_unicode
-+del StrTest.test_decodeascii
-+# del StrTest.test_encode_utf32
-+# del StrTest.test_encode_utf7
-+# del StrTest.test_encode_raw_unicode_escape
-+#
-+# del TupleTest.test_from_2G_generator
-+#
-+# del BufferTest.test_repeat
- 
- if __name__ == '__main__':
-     if len(sys.argv) > 1:
diff --git a/lang/python31/files/patch-lib-test_test_hashlib.py b/lang/python31/files/patch-lib-test_test_hashlib.py
deleted file mode 100644
index 15ede2b17e8c..000000000000
--- a/lang/python31/files/patch-lib-test_test_hashlib.py
+++ /dev/null
@@ -1,41 +0,0 @@
---- Lib/test/test_hashlib.py.orig	2005-08-21 19:45:59.000000000 +0100
-+++ Lib/test/test_hashlib.py	2008-08-30 10:43:27.000000000 +0100
-@@ -9,7 +9,7 @@
- import hashlib
- import unittest
- from test import test_support
--
-+from test.test_support import _4G, precisionbigmemtest
- 
- def hexstr(s):
-     import string
-@@ -55,7 +55,6 @@
-             m2.update(aas + bees + cees)
-             self.assertEqual(m1.digest(), m2.digest())
- 
--
-     def check(self, name, data, digest):
-         # test the direct constructors
-         computed = getattr(hashlib, name)(data).hexdigest()
-@@ -75,6 +74,21 @@
-         self.check('md5', 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789',
-                    'd174ab98d277d9f5a5611c2c9f419d9f')
- 
-+    @precisionbigmemtest(size=_4G + 5, memuse=1)
-+    def test_case_md5_huge(self, size):
-+        if size == _4G + 5:
-+            try:
-+                self.check('md5', 'A'*size, 'c9af2dff37468ce5dfee8f2cfc0a9c6d')
-+            except OverflowError:
-+                pass # 32-bit arch
-+
-+    @precisionbigmemtest(size=_4G - 1, memuse=1)
-+    def test_case_md5_uintmax(self, size):
-+        if size == _4G - 1:
-+            try:
-+                self.check('md5', 'A'*size, '28138d306ff1b8281f1a9067e1a1a2b3')
-+            except OverflowError:
-+                pass # 32-bit arch
- 
-     # use the three examples from Federal Information Processing Standards
-     # Publication 180-1, Secure Hash Standard,  1995 April 17
diff --git a/lang/python31/files/patch-lib-test_test_strop.py b/lang/python31/files/patch-lib-test_test_strop.py
deleted file mode 100644
index f0e40166957a..000000000000
--- a/lang/python31/files/patch-lib-test_test_strop.py
+++ /dev/null
@@ -1,28 +0,0 @@
---- Lib/test/test_strop.py.orig	2002-07-31 00:27:12.000000000 +0100
-+++ Lib/test/test_strop.py	2008-08-30 10:16:13.000000000 +0100
-@@ -115,6 +115,25 @@
-         strop.uppercase
-         strop.whitespace
- 
-+    @test_support.precisionbigmemtest(size=test_support._2G - 1, memuse=5)
-+    def test_stropjoin_huge_list(self, size):
-+        a = "A" * size
-+        try:
-+            r = strop.join([a, a], a)
-+        except OverflowError:
-+            pass
-+        else:
-+            self.assertEquals(len(r), len(a) * 3)
-+
-+    @test_support.precisionbigmemtest(size=test_support._2G - 1, memuse=1)
-+    def test_stropjoin_huge_tup(self, size):
-+        a = "A" * size
-+        try:
-+            r = strop.join((a, a), a)
-+        except OverflowError:
-+            pass # acceptable on 32-bit
-+        else:
-+            self.assertEquals(len(r), len(a) * 3)
- 
- transtable = '\000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037 !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`xyzdefghijklmnopqrstuvwxyz{|}~\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377'
- 
diff --git a/lang/python31/files/patch-lib-test_test_support.py b/lang/python31/files/patch-lib-test_test_support.py
deleted file mode 100644
index b11933bc7eed..000000000000
--- a/lang/python31/files/patch-lib-test_test_support.py
+++ /dev/null
@@ -1,62 +0,0 @@
---- Lib/test/test_support.py.orig	2008-01-27 01:24:44.000000000 +0000
-+++ Lib/test/test_support.py	2008-08-30 10:16:13.000000000 +0100
-@@ -33,6 +33,7 @@
- use_resources = None     # Flag set to [] by regrtest.py
- max_memuse = 0           # Disable bigmem tests (they will still be run with
-                          # small sizes, to make sure they work.)
-+real_max_memuse = 0
- 
- # _original_stdout is meant to hold stdout at the time regrtest began.
- # This may be "the real" stdout, or IDLE's emulation of stdout, or whatever.
-@@ -323,6 +324,7 @@
- _1M = 1024*1024
- _1G = 1024 * _1M
- _2G = 2 * _1G
-+_4G = 4 * _1G
- 
- # Hack to get at the maximum value an internal index can take.
- class _Dummy:
-@@ -333,6 +335,7 @@
- def set_memlimit(limit):
-     import re
-     global max_memuse
-+    global real_max_memuse
-     sizes = {
-         'k': 1024,
-         'm': _1M,
-@@ -344,6 +347,7 @@
-     if m is None:
-         raise ValueError('Invalid memory limit %r' % (limit,))
-     memlimit = int(float(m.group(1)) * sizes[m.group(3).lower()])
-+    real_max_memuse = memlimit
-     if memlimit > MAX_Py_ssize_t:
-         memlimit = MAX_Py_ssize_t
-     if memlimit < _2G - 1:
-@@ -389,6 +393,27 @@
-         return wrapper
-     return decorator
- 
-+def precisionbigmemtest(size, memuse, overhead=5*_1M):
-+    def decorator(f):
-+        def wrapper(self):
-+            if not real_max_memuse:
-+                maxsize = 5147
-+            else:
-+                maxsize = size
-+
-+                if real_max_memuse and real_max_memuse < maxsize * memuse:
-+                    if verbose:
-+                        sys.stderr.write("Skipping %s because of memory "
-+                                         "constraint\n" % (f.__name__,))
-+                    return
-+
-+            return f(self, maxsize)
-+        wrapper.size = size
-+        wrapper.memuse = memuse
-+        wrapper.overhead = overhead
-+        return wrapper
-+    return decorator
-+
- def bigaddrspacetest(f):
-     """Decorator for tests that fill the address space."""
-     def wrapper(self):
diff --git a/lang/python31/files/patch-lib_seq_tests.py b/lang/python31/files/patch-lib_seq_tests.py
deleted file mode 100644
index 9be35ae82517..000000000000
--- a/lang/python31/files/patch-lib_seq_tests.py
+++ /dev/null
@@ -1,21 +0,0 @@
---- Lib/test/seq_tests.py.orig	2007-11-12 20:04:41.000000000 +0000
-+++ Lib/test/seq_tests.py	2008-08-30 10:16:13.000000000 +0100
-@@ -307,11 +307,13 @@
-             self.assertEqual(id(s), id(s*1))
- 
-     def test_bigrepeat(self):
--        x = self.type2test([0])
--        x *= 2**16
--        self.assertRaises(MemoryError, x.__mul__, 2**16)
--        if hasattr(x, '__imul__'):
--            self.assertRaises(MemoryError, x.__imul__, 2**16)
-+        import sys
-+        if sys.maxint <= 2147483647:
-+            x = self.type2test([0])
-+            x *= 2**16
-+            self.assertRaises(MemoryError, x.__mul__, 2**16)
-+            if hasattr(x, '__imul__'):
-+                self.assertRaises(MemoryError, x.__imul__, 2**16)
- 
-     def test_subscript(self):
-         a = self.type2test([10, 11])
diff --git a/lang/python31/files/patch-modules_almodule.c b/lang/python31/files/patch-modules_almodule.c
deleted file mode 100644
index 8e3b9b11380d..000000000000
--- a/lang/python31/files/patch-modules_almodule.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- Modules/almodule.c.orig	2006-09-25 07:53:42.000000000 +0100
-+++ Modules/almodule.c	2008-08-30 10:39:43.000000000 +0100
-@@ -1633,9 +1633,11 @@
- 	if (nvals < 0)
- 		goto cleanup;
- 	if (nvals > setsize) {
-+		ALvalue *old_return_set = return_set;
- 		setsize = nvals;
- 		PyMem_RESIZE(return_set, ALvalue, setsize);
- 		if (return_set == NULL) {
-+			return_set = old_return_set;
- 			PyErr_NoMemory();
- 			goto cleanup;
- 		}
diff --git a/lang/python31/files/patch-modules_arraymodule.c b/lang/python31/files/patch-modules_arraymodule.c
deleted file mode 100644
index 738ee48f1485..000000000000
--- a/lang/python31/files/patch-modules_arraymodule.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- Modules/arraymodule.c.orig	2008-02-15 19:11:46.000000000 +0000
-+++ Modules/arraymodule.c	2008-08-30 10:39:43.000000000 +0100
-@@ -816,6 +816,7 @@
- array_do_extend(arrayobject *self, PyObject *bb)
- {
- 	Py_ssize_t size;
-+	char *old_item;
- 
- 	if (!array_Check(bb))
- 		return array_iter_extend(self, bb);
-@@ -831,10 +832,11 @@
- 			return -1;
- 	}
- 	size = self->ob_size + b->ob_size;
-+	old_item = self->ob_item;
-         PyMem_RESIZE(self->ob_item, char, size*self->ob_descr->itemsize);
-         if (self->ob_item == NULL) {
--                PyObject_Del(self);
--                PyErr_NoMemory();
-+		self->ob_item = old_item;
-+		PyErr_NoMemory();
- 		return -1;
-         }
- 	memcpy(self->ob_item + self->ob_size*self->ob_descr->itemsize,
-@@ -886,7 +888,7 @@
- 			if (size > PY_SSIZE_T_MAX / n) {
- 				return PyErr_NoMemory();
- 			}
--			PyMem_Resize(items, char, n * size);
-+			PyMem_RESIZE(items, char, n * size);
- 			if (items == NULL)
- 				return PyErr_NoMemory();
- 			p = items;
diff --git a/lang/python31/files/patch-modules_gcmodule.c b/lang/python31/files/patch-modules_gcmodule.c
deleted file mode 100644
index 59253930e9c3..000000000000
--- a/lang/python31/files/patch-modules_gcmodule.c
+++ /dev/null
@@ -1,58 +0,0 @@
---- Include/pymem.h.orig	2008-02-14 11:26:18.000000000 +0000
-+++ Include/pymem.h	2008-08-30 10:39:43.000000000 +0100
-@@ -67,8 +67,12 @@
-    for malloc(0), which would be treated as an error. Some platforms
-    would return a pointer with no memory behind it, which would break
-    pymalloc. To solve these problems, allocate an extra byte. */
--#define PyMem_MALLOC(n)         malloc((n) ? (n) : 1)
--#define PyMem_REALLOC(p, n)     realloc((p), (n) ? (n) : 1)
-+/* Returns NULL to indicate error if a negative size or size larger than
-+   Py_ssize_t can represent is supplied.  Helps prevents security holes. */
-+#define PyMem_MALLOC(n)		(((n) < 0 || (n) > PY_SSIZE_T_MAX) ? NULL \
-+				: malloc((n) ? (n) : 1))
-+#define PyMem_REALLOC(p, n)	(((n) < 0 || (n) > PY_SSIZE_T_MAX) ? NULL \
-+				: realloc((p), (n) ? (n) : 1))
- #define PyMem_FREE		free
- 
- #endif	/* PYMALLOC_DEBUG */
-@@ -77,24 +81,31 @@
-  * Type-oriented memory interface
-  * ==============================
-  *
-- * These are carried along for historical reasons.  There's rarely a good
-- * reason to use them anymore (you can just as easily do the multiply and
-- * cast yourself).
-+ * Allocate memory for n objects of the given type.  Returns a new pointer
-+ * or NULL if the request was too large or memory allocation failed.  Use
-+ * these macros rather than doing the multiplication yourself so that proper
-+ * overflow checking is always done.
-  */
- 
- #define PyMem_New(type, n) \
--  ( assert((n) <= PY_SIZE_MAX / sizeof(type)) , \
-+  ( ((n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \
- 	( (type *) PyMem_Malloc((n) * sizeof(type)) ) )
- #define PyMem_NEW(type, n) \
--  ( assert((n) <= PY_SIZE_MAX / sizeof(type)) , \
-+  ( ((n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \
- 	( (type *) PyMem_MALLOC((n) * sizeof(type)) ) )
- 
-+/*
-+ * The value of (p) is always clobbered by this macro regardless of success.
-+ * The caller MUST check if (p) is NULL afterwards and deal with the memory
-+ * error if so.  This means the original value of (p) MUST be saved for the
-+ * caller's memory error handler to not lose track of it.
-+ */
- #define PyMem_Resize(p, type, n) \
--  ( assert((n) <= PY_SIZE_MAX / sizeof(type)) , \
--	( (p) = (type *) PyMem_Realloc((p), (n) * sizeof(type)) ) )
-+  ( (p) = ((n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \
-+	(type *) PyMem_Realloc((p), (n) * sizeof(type)) )
- #define PyMem_RESIZE(p, type, n) \
--  ( assert((n) <= PY_SIZE_MAX / sizeof(type)) , \
--	( (p) = (type *) PyMem_REALLOC((p), (n) * sizeof(type)) ) )
-+  ( (p) = ((n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \
-+	(type *) PyMem_REALLOC((p), (n) * sizeof(type)) )
- 
- /* PyMem{Del,DEL} are left over from ancient days, and shouldn't be used
-  * anymore.  They're just confusing aliases for PyMem_{Free,FREE} now.
diff --git a/lang/python31/files/patch-modules_hashopenssl.c b/lang/python31/files/patch-modules_hashopenssl.c
deleted file mode 100644
index 1f0cd56a244a..000000000000
--- a/lang/python31/files/patch-modules_hashopenssl.c
+++ /dev/null
@@ -1,104 +0,0 @@
---- Modules/_hashopenssl.c.orig	2006-05-29 22:04:52.000000000 +0100
-+++ Modules/_hashopenssl.c	2008-08-30 10:43:27.000000000 +0100
-@@ -19,6 +19,8 @@
- /* EVP is the preferred interface to hashing in OpenSSL */
- #include <openssl/evp.h>
- 
-+#define MUNCH_SIZE INT_MAX
-+
- 
- #ifndef HASH_OBJ_CONSTRUCTOR
- #define HASH_OBJ_CONSTRUCTOR 0
-@@ -164,9 +166,18 @@
-     if (!PyArg_ParseTuple(args, "s#:update", &cp, &len))
-         return NULL;
- 
-+    if (len > 0 && len <= MUNCH_SIZE) {
-     EVP_DigestUpdate(&self->ctx, cp, Py_SAFE_DOWNCAST(len, Py_ssize_t,
-                                                       unsigned int));
--
-+    } else {
-+        Py_ssize_t offset = 0;
-+        while (len) {
-+            unsigned int process = len > MUNCH_SIZE ? MUNCH_SIZE : len;
-+            EVP_DigestUpdate(&self->ctx, cp + offset, process);
-+            len -= process;
-+            offset += process;
-+        }
-+    }
-     Py_INCREF(Py_None);
-     return Py_None;
- }
-@@ -255,9 +266,20 @@
-     self->name = name_obj;
-     Py_INCREF(self->name);
- 
--    if (cp && len)
-+    if (cp && len) {
-+        if (len > 0 && len <= MUNCH_SIZE) {
-         EVP_DigestUpdate(&self->ctx, cp, Py_SAFE_DOWNCAST(len, Py_ssize_t,
-                                                           unsigned int));
-+        } else {
-+            Py_ssize_t offset = 0;
-+            while (len) {
-+                unsigned int process = len > MUNCH_SIZE ? MUNCH_SIZE : len;
-+                EVP_DigestUpdate(&self->ctx, cp + offset, process);
-+                len -= process;
-+                offset += process;
-+            }
-+        }
-+    }
- 
-     return 0;
- }
-@@ -328,7 +350,7 @@
- static PyObject *
- EVPnew(PyObject *name_obj,
-        const EVP_MD *digest, const EVP_MD_CTX *initial_ctx,
--       const unsigned char *cp, unsigned int len)
-+       const unsigned char *cp, Py_ssize_t len)
- {
-     EVPobject *self;
- 
-@@ -346,8 +368,20 @@
-         EVP_DigestInit(&self->ctx, digest);
-     }
- 
--    if (cp && len)
--        EVP_DigestUpdate(&self->ctx, cp, len);
-+    if (cp && len) {
-+        if (len > 0 && len <= MUNCH_SIZE) {
-+            EVP_DigestUpdate(&self->ctx, cp, Py_SAFE_DOWNCAST(len, Py_ssize_t,
-+                                                              unsigned int));
-+        } else {
-+            Py_ssize_t offset = 0;
-+            while (len) {
-+                unsigned int process = len > MUNCH_SIZE ? MUNCH_SIZE : len;
-+                EVP_DigestUpdate(&self->ctx, cp + offset, process);
-+                len -= process;
-+                offset += process;
-+            }
-+        }
-+    }
- 
-     return (PyObject *)self;
- }
-@@ -384,8 +418,7 @@
- 
-     digest = EVP_get_digestbyname(name);
- 
--    return EVPnew(name_obj, digest, NULL, cp, Py_SAFE_DOWNCAST(len, Py_ssize_t,
--                                                               unsigned int));
-+    return EVPnew(name_obj, digest, NULL, cp, len);
- }
- 
- /*
-@@ -410,7 +443,7 @@
-                 CONST_ ## NAME ## _name_obj, \
-                 NULL, \
-                 CONST_new_ ## NAME ## _ctx_p, \
--                cp, Py_SAFE_DOWNCAST(len, Py_ssize_t, unsigned int)); \
-+                cp, len); \
-     }
- 
- /* a PyMethodDef structure for the constructor */
diff --git a/lang/python31/files/patch-modules_mmapmodule.c b/lang/python31/files/patch-modules_mmapmodule.c
deleted file mode 100644
index 60f3d71ff349..000000000000
--- a/lang/python31/files/patch-modules_mmapmodule.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- Modules/mmapmodule.c.orig	2006-08-22 14:57:07.000000000 +0100
-+++ Modules/mmapmodule.c	2008-08-30 10:16:13.000000000 +0100
-@@ -223,7 +223,7 @@
- 		return(NULL);
- 
- 	/* silently 'adjust' out-of-range requests */
--	if ((self->pos + num_bytes) > self->size) {
-+	if (num_bytes > self->size - self->pos) {
- 		num_bytes -= (self->pos+num_bytes) - self->size;
- 	}
- 	result = Py_BuildValue("s#", self->data+self->pos, num_bytes);
diff --git a/lang/python31/files/patch-modules_selectmodule.c b/lang/python31/files/patch-modules_selectmodule.c
deleted file mode 100644
index 446241f05a97..000000000000
--- a/lang/python31/files/patch-modules_selectmodule.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- Modules/selectmodule.c.orig	2006-07-10 02:18:57.000000000 +0100
-+++ Modules/selectmodule.c	2008-08-30 10:39:43.000000000 +0100
-@@ -349,10 +349,12 @@
- {
- 	Py_ssize_t i, pos;
- 	PyObject *key, *value;
-+        struct pollfd *old_ufds = self->ufds;
- 
- 	self->ufd_len = PyDict_Size(self->dict);
--	PyMem_Resize(self->ufds, struct pollfd, self->ufd_len);
-+	PyMem_RESIZE(self->ufds, struct pollfd, self->ufd_len);
- 	if (self->ufds == NULL) {
-+                self->ufds = old_ufds;
- 		PyErr_NoMemory();
- 		return 0;
- 	}
diff --git a/lang/python31/files/patch-modules_stropmodule.c b/lang/python31/files/patch-modules_stropmodule.c
deleted file mode 100644
index d7f42ce18871..000000000000
--- a/lang/python31/files/patch-modules_stropmodule.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- Modules/stropmodule.c.orig	2008-02-14 11:26:18.000000000 +0000
-+++ Modules/stropmodule.c	2008-08-30 10:16:13.000000000 +0100
-@@ -216,6 +216,13 @@
- 				return NULL;
- 			}
- 			slen = PyString_GET_SIZE(item);
-+			if (slen > PY_SSIZE_T_MAX - reslen ||
-+			    seplen > PY_SSIZE_T_MAX - reslen - seplen) {
-+				PyErr_SetString(PyExc_OverflowError,
-+						"input too long");
-+				Py_DECREF(res);
-+				return NULL;
-+			}
- 			while (reslen + slen + seplen >= sz) {
- 				if (_PyString_Resize(&res, sz * 2) < 0)
- 					return NULL;
-@@ -253,6 +260,14 @@
- 			return NULL;
- 		}
- 		slen = PyString_GET_SIZE(item);
-+		if (slen > PY_SSIZE_T_MAX - reslen ||
-+		    seplen > PY_SSIZE_T_MAX - reslen - seplen) {
-+			PyErr_SetString(PyExc_OverflowError,
-+					"input too long");
-+			Py_DECREF(res);
-+			Py_XDECREF(item);
-+			return NULL;
-+		}
- 		while (reslen + slen + seplen >= sz) {
- 			if (_PyString_Resize(&res, sz * 2) < 0) {
- 				Py_DECREF(item);
diff --git a/lang/python31/files/patch-objects_bufferobject.c b/lang/python31/files/patch-objects_bufferobject.c
deleted file mode 100644
index 16e99568ad9a..000000000000
--- a/lang/python31/files/patch-objects_bufferobject.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- Objects/bufferobject.c.orig	2008-02-14 11:26:18.000000000 +0000
-+++ Objects/bufferobject.c	2008-08-30 10:16:13.000000000 +0100
-@@ -427,6 +427,10 @@
- 		count = 0;
- 	if (!get_buf(self, &ptr, &size, ANY_BUFFER))
- 		return NULL;
-+	if (count > PY_SSIZE_T_MAX / size) {
-+		PyErr_SetString(PyExc_MemoryError, "result too large");
-+		return NULL;
-+	}
- 	ob = PyString_FromStringAndSize(NULL, size * count);
- 	if ( ob == NULL )
- 		return NULL;
diff --git a/lang/python31/files/patch-objects_longobject.c b/lang/python31/files/patch-objects_longobject.c
deleted file mode 100644
index 1221db9fed0a..000000000000
--- a/lang/python31/files/patch-objects_longobject.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- Objects/longobject.c.orig	2007-05-07 19:30:48.000000000 +0100
-+++ Objects/longobject.c	2008-08-30 10:16:13.000000000 +0100
-@@ -70,6 +70,8 @@
- 		PyErr_NoMemory();
- 		return NULL;
- 	}
-+	/* XXX(nnorwitz): This can overflow --
-+	   PyObject_NEW_VAR /  _PyObject_VAR_SIZE need to detect overflow */
- 	return PyObject_NEW_VAR(PyLongObject, &PyLong_Type, size);
- }
- 
diff --git a/lang/python31/files/patch-objects_obmalloc.c b/lang/python31/files/patch-objects_obmalloc.c
deleted file mode 100644
index 27050596fbfc..000000000000
--- a/lang/python31/files/patch-objects_obmalloc.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- Objects/obmalloc.c.orig	2008-02-14 11:26:18.000000000 +0000
-+++ Objects/obmalloc.c	2008-08-30 10:39:43.000000000 +0100
-@@ -727,6 +727,15 @@
- 	uint size;
- 
- 	/*
-+	 * Limit ourselves to PY_SSIZE_T_MAX bytes to prevent security holes.
-+	 * Most python internals blindly use a signed Py_ssize_t to track
-+	 * things without checking for overflows or negatives.
-+	 * As size_t is unsigned, checking for nbytes < 0 is not required.
-+	 */
-+	if (nbytes > PY_SSIZE_T_MAX)
-+		return NULL;
-+
-+	/*
- 	 * This implicitly redirects malloc(0).
- 	 */
- 	if ((nbytes - 1) < SMALL_REQUEST_THRESHOLD) {
-@@ -1130,6 +1139,15 @@
- 	if (p == NULL)
- 		return PyObject_Malloc(nbytes);
- 
-+	/*
-+	 * Limit ourselves to PY_SSIZE_T_MAX bytes to prevent security holes.
-+	 * Most python internals blindly use a signed Py_ssize_t to track
-+	 * things without checking for overflows or negatives.
-+	 * As size_t is unsigned, checking for nbytes < 0 is not required.
-+	 */
-+	if (nbytes > PY_SSIZE_T_MAX)
-+		return NULL;
-+
- 	pool = POOL_ADDR(p);
- 	if (Py_ADDRESS_IN_RANGE(p, pool)) {
- 		/* We're in charge of this block */
diff --git a/lang/python31/files/patch-objects_stringobject.c b/lang/python31/files/patch-objects_stringobject.c
deleted file mode 100644
index af55c78a4928..000000000000
--- a/lang/python31/files/patch-objects_stringobject.c
+++ /dev/null
@@ -1,49 +0,0 @@
---- Objects/stringobject.c.orig	2007-11-07 01:19:49.000000000 +0000
-+++ Objects/stringobject.c	2008-08-30 10:16:13.000000000 +0100
-@@ -71,6 +71,11 @@
- 		return (PyObject *)op;
- 	}
- 
-+	if (size > PY_SSIZE_T_MAX - sizeof(PyStringObject)) {
-+		PyErr_SetString(PyExc_OverflowError, "string is too large");
-+		return NULL;
-+	}
-+
- 	/* Inline PyObject_NewVar */
- 	op = (PyStringObject *)PyObject_MALLOC(sizeof(PyStringObject) + size);
- 	if (op == NULL)
-@@ -106,7 +111,7 @@
- 
- 	assert(str != NULL);
- 	size = strlen(str);
--	if (size > PY_SSIZE_T_MAX) {
-+	if (size > PY_SSIZE_T_MAX - sizeof(PyStringObject)) {
- 		PyErr_SetString(PyExc_OverflowError,
- 			"string is too long for a Python string");
- 		return NULL;
-@@ -967,14 +972,24 @@
- 		Py_INCREF(a);
- 		return (PyObject *)a;
- 	}
-+	/* Check that string sizes are not negative, to prevent an
-+	   overflow in cases where we are passed incorrectly-created
-+	   strings with negative lengths (due to a bug in other code).
-+	*/
- 	size = a->ob_size + b->ob_size;
--	if (size < 0) {
-+	if (a->ob_size < 0 || b->ob_size < 0 ||
-+	    a->ob_size > PY_SSIZE_T_MAX - b->ob_size) {
- 		PyErr_SetString(PyExc_OverflowError,
- 				"strings are too large to concat");
- 		return NULL;
- 	}
- 	  
- 	/* Inline PyObject_NewVar */
-+	if (size > PY_SSIZE_T_MAX - sizeof(PyStringObject)) {
-+		PyErr_SetString(PyExc_OverflowError,
-+				"strings are too large to concat");
-+		return NULL;
-+	}
- 	op = (PyStringObject *)PyObject_MALLOC(sizeof(PyStringObject) + size);
- 	if (op == NULL)
- 		return PyErr_NoMemory();
diff --git a/lang/python31/files/patch-objects_tupleobject.c b/lang/python31/files/patch-objects_tupleobject.c
deleted file mode 100644
index eb133b6e002c..000000000000
--- a/lang/python31/files/patch-objects_tupleobject.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- Objects/tupleobject.c.orig	2006-08-12 18:03:09.000000000 +0100
-+++ Objects/tupleobject.c	2008-08-30 10:16:13.000000000 +0100
-@@ -60,11 +60,12 @@
- 		Py_ssize_t nbytes = size * sizeof(PyObject *);
- 		/* Check for overflow */
- 		if (nbytes / sizeof(PyObject *) != (size_t)size ||
--		    (nbytes += sizeof(PyTupleObject) - sizeof(PyObject *))
--		    <= 0)
-+		    (nbytes > PY_SSIZE_T_MAX - sizeof(PyTupleObject) - sizeof(PyObject *)))
- 		{
- 			return PyErr_NoMemory();
- 		}
-+		nbytes += sizeof(PyTupleObject) - sizeof(PyObject *);
-+
- 		op = PyObject_GC_NewVar(PyTupleObject, &PyTuple_Type, size);
- 		if (op == NULL)
- 			return NULL;
diff --git a/lang/python31/files/patch-objects_unicodeobject.c b/lang/python31/files/patch-objects_unicodeobject.c
deleted file mode 100644
index 85e88caae0e3..000000000000
--- a/lang/python31/files/patch-objects_unicodeobject.c
+++ /dev/null
@@ -1,115 +0,0 @@
---- Objects/unicodeobject.c.orig	2007-11-02 22:46:38.000000000 +0000
-+++ Objects/unicodeobject.c	2008-08-30 10:16:13.000000000 +0100
-@@ -239,6 +239,11 @@
-         return unicode_empty;
-     }
- 
-+    /* Ensure we won't overflow the size. */
-+    if (length > ((PY_SSIZE_T_MAX / sizeof(Py_UNICODE)) - 1)) {
-+        return (PyUnicodeObject *)PyErr_NoMemory();
-+    }
-+
-     /* Unicode freelist & memory allocation */
-     if (unicode_freelist) {
-         unicode = unicode_freelist;
-@@ -1091,6 +1096,9 @@
-     char * out;
-     char * start;
- 
-+    if (cbAllocated / 5 != size)
-+        return PyErr_NoMemory();
-+
-     if (size == 0)
- 		return PyString_FromStringAndSize(NULL, 0);
- 
-@@ -1689,8 +1697,9 @@
- {
-     PyObject *v;
-     unsigned char *p;
-+    Py_ssize_t nsize, bytesize;
- #ifdef Py_UNICODE_WIDE
--    int i, pairs;
-+    Py_ssize_t i, pairs;
- #else
-     const int pairs = 0;
- #endif
-@@ -1713,8 +1722,15 @@
- 	if (s[i] >= 0x10000)
- 	    pairs++;
- #endif
--    v = PyString_FromStringAndSize(NULL,
--		  2 * (size + pairs + (byteorder == 0)));
-+    /* 2 * (size + pairs + (byteorder == 0)) */
-+    if (size > PY_SSIZE_T_MAX ||
-+	size > PY_SSIZE_T_MAX - pairs - (byteorder == 0))
-+	return PyErr_NoMemory();
-+    nsize = (size + pairs + (byteorder == 0));
-+    bytesize = nsize * 2;
-+    if (bytesize / 2 != nsize)
-+	return PyErr_NoMemory();
-+    v = PyString_FromStringAndSize(NULL, bytesize);
-     if (v == NULL)
-         return NULL;
- 
-@@ -2042,6 +2058,11 @@
-     char *p;
- 
-     static const char *hexdigit = "0123456789abcdef";
-+#ifdef Py_UNICODE_WIDE
-+    const Py_ssize_t expandsize = 10;
-+#else
-+    const Py_ssize_t expandsize = 6;
-+#endif
- 
-     /* Initial allocation is based on the longest-possible unichr
-        escape.
-@@ -2057,13 +2078,12 @@
-        escape.
-     */
- 
-+    if (size > (PY_SSIZE_T_MAX - 2 - 1) / expandsize)
-+	return PyErr_NoMemory();
-+
-     repr = PyString_FromStringAndSize(NULL,
-         2
--#ifdef Py_UNICODE_WIDE
--        + 10*size
--#else
--        + 6*size
--#endif
-+        + expandsize*size
-         + 1);
-     if (repr == NULL)
-         return NULL;
-@@ -2304,12 +2324,16 @@
-     char *q;
- 
-     static const char *hexdigit = "0123456789abcdef";
--
- #ifdef Py_UNICODE_WIDE
--    repr = PyString_FromStringAndSize(NULL, 10 * size);
-+    const Py_ssize_t expandsize = 10;
- #else
--    repr = PyString_FromStringAndSize(NULL, 6 * size);
-+    const Py_ssize_t expandsize = 6;
- #endif
-+
-+    if (size > PY_SSIZE_T_MAX / expandsize)
-+	return PyErr_NoMemory();
-+
-+    repr = PyString_FromStringAndSize(NULL, expandsize * size);
-     if (repr == NULL)
-         return NULL;
-     if (size == 0)
-@@ -4719,6 +4743,11 @@
-         return self;
-     }
- 
-+    if (left > PY_SSIZE_T_MAX - self->length ||
-+	right > PY_SSIZE_T_MAX - (left + self->length)) {
-+        PyErr_SetString(PyExc_OverflowError, "padded string is too long");
-+        return NULL;
-+    }
-     u = _PyUnicode_New(left + self->length + right);
-     if (u) {
-         if (left)
diff --git a/lang/python31/files/patch-python_mysnprintf.c b/lang/python31/files/patch-python_mysnprintf.c
deleted file mode 100644
index 276dd21a1b31..000000000000
--- a/lang/python31/files/patch-python_mysnprintf.c
+++ /dev/null
@@ -1,55 +0,0 @@
---- Python/mysnprintf.c.orig	2001-12-21 16:32:15.000000000 +0000
-+++ Python/mysnprintf.c	2008-08-30 10:46:31.000000000 +0100
-@@ -54,18 +54,28 @@
- PyOS_vsnprintf(char *str, size_t size, const char  *format, va_list va)
- {
- 	int len;  /* # bytes written, excluding \0 */
--#ifndef HAVE_SNPRINTF
-+#ifdef HAVE_SNPRINTF
-+#define _PyOS_vsnprintf_EXTRA_SPACE 1
-+#else
-+#define _PyOS_vsnprintf_EXTRA_SPACE 512
- 	char *buffer;
- #endif
- 	assert(str != NULL);
- 	assert(size > 0);
- 	assert(format != NULL);
-+	/* We take a size_t as input but return an int.  Sanity check
-+	 * our input so that it won't cause an overflow in the
-+         * vsnprintf return value or the buffer malloc size.  */
-+	if (size > INT_MAX - _PyOS_vsnprintf_EXTRA_SPACE) {
-+		len = -666;
-+		goto Done;
-+	}
- 
- #ifdef HAVE_SNPRINTF
- 	len = vsnprintf(str, size, format, va);
- #else
- 	/* Emulate it. */
--	buffer = PyMem_MALLOC(size + 512);
-+	buffer = PyMem_MALLOC(size + _PyOS_vsnprintf_EXTRA_SPACE);
- 	if (buffer == NULL) {
- 		len = -666;
- 		goto Done;
-@@ -75,7 +85,7 @@
- 	if (len < 0)
- 		/* ignore the error */;
- 
--	else if ((size_t)len >= size + 512)
-+	else if ((size_t)len >= size + _PyOS_vsnprintf_EXTRA_SPACE)
- 		Py_FatalError("Buffer overflow in PyOS_snprintf/PyOS_vsnprintf");
- 
- 	else {
-@@ -86,8 +96,10 @@
- 		str[to_copy] = '\0';
- 	}
- 	PyMem_FREE(buffer);
--Done:
- #endif
--	str[size-1] = '\0';
-+Done:
-+	if (size > 0)
-+		str[size-1] = '\0';
- 	return len;
-+#undef _PyOS_vsnprintf_EXTRA_SPACE
- }
diff --git a/lang/python31/files/patch-setup.py b/lang/python31/files/patch-setup.py
index 35e7763f270c..fee5a1bc299a 100644
--- a/lang/python31/files/patch-setup.py
+++ b/lang/python31/files/patch-setup.py
@@ -1,6 +1,6 @@
---- setup.py.orig	2008-02-29 22:57:02.000000000 +0900
-+++ setup.py	2008-02-29 23:01:47.000000000 +0900
-@@ -15,7 +15,7 @@
+--- setup.py.orig	2008-09-30 09:15:45.000000000 +0900
++++ setup.py	2008-10-09 20:34:35.000000000 +0900
+@@ -17,7 +17,7 @@
  from distutils.command.install_lib import install_lib
  
  # This global variable is used to hold the list of modules to be disabled.
@@ -9,7 +9,7 @@
  
  def add_dir_to_list(dirlist, dir):
      """Add the directory 'dir' to the list 'dirlist' (at the front) if
-@@ -489,7 +489,7 @@
+@@ -575,7 +575,7 @@
  
              readline_libs = ['readline']
              if self.compiler.find_library_file(lib_dirs,
@@ -18,7 +18,7 @@
                  readline_libs.append('ncursesw')
              elif self.compiler.find_library_file(lib_dirs,
                                                   'ncurses'):
-@@ -501,7 +501,7 @@
+@@ -587,7 +587,7 @@
                                                 'termcap'):
                  readline_libs.append('termcap')
              exts.append( Extension('readline', ['readline.c'],
@@ -26,26 +26,17 @@
 +                                   library_dirs=['/usr/lib', '/usr/lib/termcap'],
                                     extra_link_args=readline_extra_link_args,
                                     libraries=readline_libs) )
-         if platform not in ['mac']:
-@@ -591,6 +591,8 @@
+         else:
+@@ -687,6 +687,8 @@
              # OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash
              exts.append( Extension('_sha256', ['sha256module.c']) )
              exts.append( Extension('_sha512', ['sha512module.c']) )
 +        else:
 +            open('.without_own_sha', 'w')
  
- 
          # Modules that provide persistent dictionary-like semantics.  You will
-@@ -857,7 +859,7 @@
-         # the more recent berkeleydb's db.h file first in the include path
-         # when attempting to compile and it will fail.
-         f = "/usr/include/db.h"
--        if os.path.exists(f) and not db_incs:
-+        if os.path.exists(f):
-             data = open(f).read()
-             m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
-             if m is not None:
-@@ -922,7 +930,7 @@
+         # probably want to arrange for at least one of them to be available on
+@@ -1066,7 +1068,7 @@
          # Curses support, requiring the System V version of curses, often
          # provided by the ncurses library.
          panel_library = 'panel'
@@ -54,7 +45,7 @@
              curses_libs = ['ncursesw']
              # Bug 1464056: If _curses.so links with ncursesw,
              # _curses_panel.so must link with panelw.
-@@ -932,6 +940,7 @@
+@@ -1076,6 +1078,7 @@
          elif (self.compiler.find_library_file(lib_dirs, 'ncurses')):
              curses_libs = ['ncurses']
              exts.append( Extension('_curses', ['_cursesmodule.c'],
@@ -62,19 +53,20 @@
                                     libraries = curses_libs) )
          elif (self.compiler.find_library_file(lib_dirs, 'curses')
                and platform != 'darwin'):
-@@ -951,6 +960,7 @@
+@@ -1097,6 +1100,7 @@
          if (module_enabled(exts, '_curses') and
              self.compiler.find_library_file(lib_dirs, panel_library)):
              exts.append( Extension('_curses_panel', ['_curses_panel.c'],
 +                                   library_dirs = ['/usr/lib'],
                                     libraries = [panel_library] + curses_libs) )
- 
- 
-@@ -1535,8 +1545,7 @@
+         else:
+             missing.append('_curses_panel')
+@@ -1869,9 +1873,7 @@
            ext_modules=[Extension('_struct', ['_struct.c'])],
  
            # Scripts to install
 -          scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
+-                     'Tools/scripts/2to3',
 -                     'Lib/smtpd.py']
 +          scripts = []
          )