You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by pf...@apache.org on 2012/08/02 02:08:49 UTC
svn commit: r1368317 - /incubator/ooo/trunk/main/python/python-freebsd.patch
Author: pfg
Date: Thu Aug 2 00:08:48 2012
New Revision: 1368317
URL: http://svn.apache.org/viewvc?rev=1368317&view=rev
Log:
Update python patches for FreeBSD.
Modified:
incubator/ooo/trunk/main/python/python-freebsd.patch
Modified: incubator/ooo/trunk/main/python/python-freebsd.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/python/python-freebsd.patch?rev=1368317&r1=1368316&r2=1368317&view=diff
==============================================================================
--- incubator/ooo/trunk/main/python/python-freebsd.patch (original)
+++ incubator/ooo/trunk/main/python/python-freebsd.patch Thu Aug 2 00:08:48 2012
@@ -1,7 +1,626 @@
-Only in misc/build/Python-2.7.3/Lib: plat-freebsd9
-diff -ru misc/Python-2.7.3/Lib/test/test_threading.py misc/build/Python-2.7.3/Lib/test/test_threading.py
+--- misc/Python-2.7.3/Lib/plat-freebsd9/IN.py 1969-12-31 19:00:00.000000000 -0500
++++ misc/build/Python-2.7.3/Lib/plat-freebsd9/IN.py 2012-08-01 18:56:04.000000000 -0500
+@@ -0,0 +1,612 @@
++# 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_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
++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 _Alignas(e): return alignas(e)
++
++def _Alignof(e): return alignof(e)
++
++def _Alignas(x): return __aligned(x)
++
++def _Alignof(x): return __alignof(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 __GLOBL(sym): return __GLOBL1(sym)
++
++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 = 700
++_POSIX_C_SOURCE = 200809
++__XSI_VISIBLE = 600
++_POSIX_C_SOURCE = 200112
++__XSI_VISIBLE = 500
++_POSIX_C_SOURCE = 199506
++_POSIX_C_SOURCE = 198808
++__POSIX_VISIBLE = 200809
++__ISO_C_VISIBLE = 1999
++__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 = 200809
++__XSI_VISIBLE = 700
++__BSD_VISIBLE = 1
++__ISO_C_VISIBLE = 1999
++def __has_feature(x): return 0
++
++def __has_include(x): return 0
++
++def __has_builtin(x): return 0
++
++__NO_TLS = 1
++
++# 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 __bswap64_const(_x): return \
++
++def __bswap32_const(_x): return \
++
++def __bswap16_const(_x): return (__uint16_t)((_x) << 8 | (_x) >> 8)
++
++def __bswap64(_x): return \
++
++def __bswap32(_x): return \
++
++def __bswap16(_x): return \
++
++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
++
++# Included from sys/_sockaddr_storage.h
++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_MH = 135
++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_SEND = 259
++IPPROTO_SPACER = 32767
++IPPORT_RESERVED = 1024
++IPPORT_EPHEMERALFIRST = 10000
++IPPORT_EPHEMERALLAST = 65535
++IPPORT_HIFIRSTAUTO = 49152
++IPPORT_HILASTAUTO = 65535
++IPPORT_RESERVEDSTART = 600
++IPPORT_MAX = 65535
++def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0)
++
++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) & 0xc0000000) == 0x80000000)
++
++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) & 0xe0000000) == 0xc0000000)
++
++IN_CLASSC_NET = 0xffffff00
++IN_CLASSC_NSHIFT = 8
++IN_CLASSC_HOST = 0x000000ff
++def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000)
++
++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) & 0xf0000000) == 0xf0000000)
++
++def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
++
++def IN_LINKLOCAL(i): return (((u_int32_t)(i) & 0xffff0000) == 0xa9fe0000)
++
++def IN_LOOPBACK(i): return (((u_int32_t)(i) & 0xff000000) == 0x7f000000)
++
++def IN_ZERONET(i): return (((u_int32_t)(i) & 0xff000000) == 0)
++
++def IN_LOCAL_GROUP(i): return (((u_int32_t)(i) & 0xffffff00) == 0xe0000000)
++
++INADDR_NONE = 0xffffffff
++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_BINDANY = 24
++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_FW3 = 48
++IP_DUMMYNET3 = 49
++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
++IP_MAX_GROUP_SRC_FILTER = 512
++IP_MAX_SOCK_SRC_FILTER = 128
++IP_MAX_SOCK_MUTE_FILTER = 128
++MCAST_UNDEFINED = 0
++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)
++
++def in_allhosts(x): return ((x).s_addr == htonl(INADDR_ALLHOSTS_GROUP))
++
++
++# 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 = 0xff010000
++IPV6_ADDR_INT32_MLL = 0xff020000
++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 = 0xffff0000
++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_BINDANY = 64
++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_MIN_MEMBERSHIPS = 31
++IPV6_MAX_MEMBERSHIPS = 4095
++IPV6_MAX_GROUP_SRC_FILTER = 512
++IPV6_MAX_SOCK_SRC_FILTER = 128
++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
++ICMPV6CTL_ND6_ONLINKNSRFC4861 = 47
++IPV6CTL_NO_RADR = 48
++IPV6CTL_NORBIT_RAIF = 49
++IPV6CTL_RFC6204W3 = 50
++IPV6CTL_MAXID = 51
+--- misc/Python-2.7.3/Lib/plat-freebsd9/regen 1969-12-31 19:00:00.000000000 -0500
++++ misc/build/Python-2.7.3/Lib/plat-freebsd9/regen 2012-08-01 18:55:27.000000000 -0500
+@@ -0,0 +1,3 @@
++#! /bin/sh
++set -v
++python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
--- misc/Python-2.7.3/Lib/test/test_threading.py 2012-04-09 18:07:32.000000000 -0500
-+++ misc/build/Python-2.7.3/Lib/test/test_threading.py 2012-07-24 22:39:03.000000000 -0500
++++ misc/build/Python-2.7.3/Lib/test/test_threading.py 2012-08-01 18:44:40.000000000 -0500
@@ -421,7 +421,7 @@
# #12316 and #11870), and fork() from a worker thread is known to trigger
# problems with some operating systems (issue #3863): skip problematic tests
@@ -11,9 +630,8 @@ diff -ru misc/Python-2.7.3/Lib/test/test
'os2emx')
def _run_and_join(self, script):
-diff -ru misc/Python-2.7.3/Modules/_ctypes/libffi/configure misc/build/Python-2.7.3/Modules/_ctypes/libffi/configure
--- misc/Python-2.7.3/Modules/_ctypes/libffi/configure 2012-04-09 18:07:33.000000000 -0500
-+++ misc/build/Python-2.7.3/Modules/_ctypes/libffi/configure 2012-07-24 22:39:03.000000000 -0500
++++ misc/build/Python-2.7.3/Modules/_ctypes/libffi/configure 2012-08-01 18:53:21.000000000 -0500
@@ -6289,7 +6289,7 @@
rm -rf conftest*
;;
@@ -23,10 +641,92 @@ diff -ru misc/Python-2.7.3/Modules/_ctyp
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
-diff -ru misc/Python-2.7.3/Python/thread_pthread.h misc/build/Python-2.7.3/Python/thread_pthread.h
+@@ -11275,6 +11275,9 @@
+ powerpc-*-freebsd*)
+ TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
+ ;;
++ powerpc64-*-freebsd*)
++ TARGET=POWERPC; TARGETDIR=powerpc
++ ;;
+ powerpc*-*-rtems*)
+ TARGET=POWERPC; TARGETDIR=powerpc
+ ;;
+--- misc/Python-2.7.3/Modules/fcntlmodule.c 2012-04-09 18:07:34.000000000 -0500
++++ misc/build/Python-2.7.3/Modules/fcntlmodule.c 2012-08-01 18:44:40.000000000 -0500
+@@ -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;
+ char *str;
+@@ -118,7 +113,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,
+ &str, &len, &mutate_arg)) {
+ char *arg;
+@@ -169,7 +164,7 @@
+ }
+
+ PyErr_Clear();
+- if (PyArg_ParseTuple(args, "O&Is#:ioctl",
++ if (PyArg_ParseTuple(args, "O&ks#:ioctl",
+ conv_descriptor, &fd, &code, &str, &len)) {
+ if (len > IOCTL_BUFSZ) {
+ PyErr_SetString(PyExc_ValueError,
+@@ -191,7 +186,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;
--- misc/Python-2.7.3/Python/thread_pthread.h 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/Python/thread_pthread.h 2012-07-24 22:39:03.000000000 -0500
-@@ -56,7 +56,6 @@
++++ misc/build/Python-2.7.3/Python/thread_pthread.h 2012-08-01 18:44:40.000000000 -0500
+@@ -38,13 +38,18 @@
+ #endif
+ #endif
+
++#ifdef __FreeBSD__
++#include <osreldate.h>
++#endif
++
+ /* The POSIX spec says that implementations supporting the sem_*
+ family of functions must indicate this by defining
+ _POSIX_SEMAPHORES. */
+ #ifdef _POSIX_SEMAPHORES
+ /* On FreeBSD 4.x, _POSIX_SEMAPHORES is defined empty, so
+ we need to add 0 to make it work there as well. */
+-#if (_POSIX_SEMAPHORES+0) == -1
++#if defined(__FreeBSD__) && __FreeBSD_version < 701104 && \
++ (_POSIX_SEMAPHORES+0) == -1
+ #define HAVE_BROKEN_POSIX_SEMAPHORES
+ #else
+ #include <semaphore.h>
+@@ -56,7 +61,6 @@
in default setting. So the process scope is preferred to get
enough number of threads to work. */
#ifdef __FreeBSD__
@@ -34,51 +734,34 @@ diff -ru misc/Python-2.7.3/Python/thread
#if __FreeBSD_version >= 500000 && __FreeBSD_version < 504101
#undef PTHREAD_SYSTEM_SCHED_SUPPORTED
#endif
-@@ -161,6 +160,9 @@
+@@ -161,6 +165,7 @@
{
pthread_t th;
int status;
-+#ifdef __FreeBSD__
-+ sigset_t set, oset;
-+#endif
++ sigset_t set, oset;
#if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
pthread_attr_t attrs;
#endif
-@@ -172,6 +174,9 @@
- if (!initialized)
- PyThread_init_thread();
-
-+#ifdef __FreeBSD__
-+ SET_THREAD_SIGMASK(SIG_SETMASK, &oset, NULL);
-+#endif
- #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
- if (pthread_attr_init(&attrs) != 0)
- return -1;
-@@ -189,7 +194,10 @@
+@@ -189,6 +194,8 @@
#if defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
pthread_attr_setscope(&attrs, PTHREAD_SCOPE_SYSTEM);
#endif
--
-+#ifdef __FreeBSD__
-+ sigfillset(&set);
-+ SET_THREAD_SIGMASK(SIG_BLOCK, &set, &oset);
-+#endif
++ sigfillset(&set);
++ SET_THREAD_SIGMASK(SIG_BLOCK, &set, &oset);
+
status = pthread_create(&th,
#if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
- &attrs,
-@@ -200,6 +208,9 @@
+@@ -200,6 +207,7 @@
(void *)arg
);
-+#ifdef __FreeBSD__
-+ SET_THREAD_SIGMASK(SIG_SETMASK, &oset, NULL);
-+#endif
++ SET_THREAD_SIGMASK(SIG_SETMASK, &oset, NULL);
#if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
pthread_attr_destroy(&attrs);
#endif
-diff -ru misc/Python-2.7.3/configure misc/build/Python-2.7.3/configure
+diff -ruN misc/Python-2.7.3/configure misc/build/Python-2.7.3/configure
--- misc/Python-2.7.3/configure 2012-04-09 18:07:36.000000000 -0500
-+++ misc/build/Python-2.7.3/configure 2012-07-24 22:39:03.000000000 -0500
++++ misc/build/Python-2.7.3/configure 2012-08-01 18:44:40.000000000 -0500
@@ -4916,7 +4916,7 @@
;;
SunOS*)
@@ -100,9 +783,9 @@ diff -ru misc/Python-2.7.3/configure mis
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
hp*|HP*)
-diff -ru misc/Python-2.7.3/setup.py misc/build/Python-2.7.3/setup.py
+diff -ruN misc/Python-2.7.3/setup.py misc/build/Python-2.7.3/setup.py
--- misc/Python-2.7.3/setup.py 2012-04-09 18:07:36.000000000 -0500
-+++ misc/build/Python-2.7.3/setup.py 2012-07-24 22:39:03.000000000 -0500
++++ misc/build/Python-2.7.3/setup.py 2012-08-01 18:44:40.000000000 -0500
@@ -1432,7 +1432,7 @@
macros = dict()
libraries = []