| --- misc/Python-2.6.1/Include/pyport.h Wed Jun 11 09:41:16 2008 |
| +++ misc/build/Python-2.6.1/Include/pyport.h Fri Apr 17 09:02:52 2009 |
| @@ -449,11 +449,6 @@ |
| in platform-specific #ifdefs. |
| **************************************************************************/ |
| |
| -#ifdef SOLARIS |
| -/* Unchecked */ |
| -extern int gethostname(char *, int); |
| -#endif |
| - |
| #ifdef __BEOS__ |
| /* Unchecked */ |
| /* It's in the libs, but not the headers... - [cjh] */ |
| --- misc/Python-2.6.1/PCbuild/pcbuild.sln 2008-06-27 04:30:34.000000000 +0200 |
| +++ misc/build/Python-2.6.1/PCbuild/pcbuild.sln 2009-03-09 22:48:14.546329900 +0100 |
| @@ -38,12 +38,12 @@ |
| {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} |
| EndProjectSection |
| EndProject |
| -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}" |
| - ProjectSection(ProjectDependencies) = postProject |
| - {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} |
| - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} |
| - EndProjectSection |
| -EndProject |
| +#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}" |
| +# ProjectSection(ProjectDependencies) = postProject |
| +# {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} |
| +# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} |
| +# EndProjectSection |
| +#EndProject |
| Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcproj", "{0E9791DB-593A-465F-98BC-681011311618}" |
| ProjectSection(ProjectDependencies) = postProject |
| {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} |
| @@ -69,34 +69,34 @@ |
| {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} |
| EndProjectSection |
| EndProject |
| -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{13CECB97-4119-4316-9D42-8534019A5A44}" |
| - ProjectSection(ProjectDependencies) = postProject |
| - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} |
| - {A1A295E5-463C-437F-81CA-1F32367685DA} = {A1A295E5-463C-437F-81CA-1F32367685DA} |
| - EndProjectSection |
| -EndProject |
| -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}" |
| - ProjectSection(ProjectDependencies) = postProject |
| - {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} |
| - {86937F53-C189-40EF-8CE8-8759D8E7D480} = {86937F53-C189-40EF-8CE8-8759D8E7D480} |
| - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} |
| - EndProjectSection |
| -EndProject |
| +#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{13CECB97-4119-4316-9D42-8534019A5A44}" |
| +# ProjectSection(ProjectDependencies) = postProject |
| +# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} |
| +# {A1A295E5-463C-437F-81CA-1F32367685DA} = {A1A295E5-463C-437F-81CA-1F32367685DA} |
| +# EndProjectSection |
| +#EndProject |
| +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}" |
| + ProjectSection(ProjectDependencies) = postProject |
| + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} |
| + {86937F53-C189-40EF-8CE8-8759D8E7D480} = {86937F53-C189-40EF-8CE8-8759D8E7D480} |
| + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} |
| + EndProjectSection |
| +EndProject |
| Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testcapi", "_testcapi.vcproj", "{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}" |
| ProjectSection(ProjectDependencies) = postProject |
| {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} |
| EndProjectSection |
| EndProject |
| -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}" |
| - ProjectSection(ProjectDependencies) = postProject |
| - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} |
| - EndProjectSection |
| -EndProject |
| -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}" |
| - ProjectSection(ProjectDependencies) = postProject |
| - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} |
| - EndProjectSection |
| -EndProject |
| +#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}" |
| +# ProjectSection(ProjectDependencies) = postProject |
| +# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} |
| +# EndProjectSection |
| +#EndProject |
| +#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}" |
| +# ProjectSection(ProjectDependencies) = postProject |
| +# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} |
| +# EndProjectSection |
| +#EndProject |
| Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select.vcproj", "{18CAE28C-B454-46C1-87A0-493D91D97F03}" |
| ProjectSection(ProjectDependencies) = postProject |
| {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} |
| @@ -114,17 +114,17 @@ |
| EndProject |
| Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "bdist_wininst.vcproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}" |
| EndProject |
| -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}" |
| - ProjectSection(ProjectDependencies) = postProject |
| - {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} |
| - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} |
| - EndProjectSection |
| -EndProject |
| -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}" |
| - ProjectSection(ProjectDependencies) = postProject |
| - {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} |
| - EndProjectSection |
| -EndProject |
| +#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}" |
| +#ProjectSection(ProjectDependencies) = postProject |
| +# {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} |
| +# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} |
| +# EndProjectSection |
| +#EndProject |
| +#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}" |
| +# ProjectSection(ProjectDependencies) = postProject |
| +# {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} |
| +# EndProjectSection |
| +#EndProject |
| Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}" |
| ProjectSection(ProjectDependencies) = postProject |
| {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} |
| --- misc/Python-2.6.1/Lib/test/test_threading.py.bak 2009-03-12 07:59:17.000000000 +0000 |
| +++ misc/build/Python-2.6.1/Lib/test/test_threading.py 2009-03-12 10:48:04.000000000 +0000 |
| @@ -382,7 +382,7 @@ |
| return |
| # Skip platforms with known problems forking from a worker thread. |
| # See http://bugs.python.org/issue3863. |
| - if sys.platform in ('freebsd4', 'freebsd5', 'freebsd6', 'os2emx'): |
| + if sys.platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9', 'os2emx'): |
| print >>sys.stderr, ('Skipping test_3_join_in_forked_from_thread' |
| ' due to known OS bugs on'), sys.platform |
| return |
| |
| --- misc/Python-2.6.1/Modules/_ctypes/libffi/configure.orig 2008-05-24 00:06:50.000000000 +0900 |
| +++ misc/build/Python-2.6.1/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. |
| |
| --- misc/Python-2.6.1/Python/thread_pthread.h.orig 2006-06-13 16:04:24.000000000 +0100 |
| +++ misc/build/Python-2.6.1/Python/thread_pthread.h 2009-03-12 10:55:49.000000000 +0000 |
| @@ -26,13 +26,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> |
| @@ -44,7 +49,6 @@ |
| in default setting. So the process scope is preferred to get |
| enough number of threads to work. */ |
| #ifdef __FreeBSD__ |
| -#include <osreldate.h> |
| #if __FreeBSD_version >= 500000 && __FreeBSD_version < 504101 |
| #undef PTHREAD_SYSTEM_SCHED_SUPPORTED |
| #endif |
| @@ -149,6 +153,9 @@ |
| { |
| pthread_t th; |
| int status; |
| +#ifdef __FreeBSD__ |
| + sigset_t set, oset; |
| +#endif |
| #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED) |
| pthread_attr_t attrs; |
| #endif |
| @@ -177,7 +184,10 @@ |
| #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 |
| status = pthread_create(&th, |
| #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED) |
| &attrs, |
| @@ -188,6 +198,9 @@ |
| (void *)arg |
| ); |
| |
| +#ifdef __FreeBSD__ |
| + SET_THREAD_SIGMASK(SIG_SETMASK, &oset, NULL); |
| +#endif |
| #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED) |
| pthread_attr_destroy(&attrs); |
| #endif |
| --- misc/Python-2.6.1/configure 2008-11-17 02:57:10.000000000 +0900 |
| +++ misc/build/Python-2.6.1/configure 2009-03-23 21:18:42.000000000 +0900 |
| @@ -4110,11 +4110,6 @@ |
| LDLIBRARY='libpython$(VERSION).so' |
| BLDLIBRARY='-L. -lpython$(VERSION)' |
| RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} |
| - case $ac_sys_system in |
| - FreeBSD*) |
| - SOVERSION=`echo $SOVERSION|cut -d "." -f 1` |
| - ;; |
| - esac |
| INSTSONAME="$LDLIBRARY".$SOVERSION |
| ;; |
| hp*|HP*) |
| --- misc/Python-2.6.1/configure Sun Nov 16 18:57:10 2008 |
| +++ misc/build/Python-2.6.1/configure Thu Apr 16 15:16:03 2009 |
| @@ -4102,7 +4102,7 @@ |
| ;; |
| SunOS*) |
| LDLIBRARY='libpython$(VERSION).so' |
| - BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(VERSION)' |
| + BLDLIBRARY=-R\'\$\$ORIGIN\'' -L. -lpython$(VERSION)' |
| RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} |
| INSTSONAME="$LDLIBRARY".$SOVERSION |
| ;; |
| --- misc/Python-2.6.1/Lib/plat-freebsd9/IN.py 1970-01-01 01:00:00.000000000 +0100 |
| +++ misc/build/Python-2.6.1/Lib/plat-freebsd9/IN.py 2009-10-03 22:43:13.000000000 +0200 |
| @@ -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 |
| --- misc/Python-2.6.1/Lib/plat-freebsd9/regen 1970-01-01 01:00:00.000000000 +0100 |
| +++ misc/build/Python-2.6.1/Lib/plat-freebsd9/regen 2009-10-03 22:43:13.000000000 +0200 |
| @@ -0,0 +1,3 @@ |
| +#! /bin/sh |
| +set -v |
| +python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h |
| --- misc/Python-2.6.1/setup.py 2009-03-31 18:20:48.000000000 +0000 |
| +++ misc/build/Python-2.6.1/setup.py 2009-09-10 05:27:01.000000000 +0000 |
| @@ -1273,7 +1277,7 @@ class PyBuildExt(build_ext): |
| ) |
| libraries = [] |
| |
| - elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'): |
| + elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9'): |
| # FreeBSD's P1003.1b semaphore support is very experimental |
| # and has many known problems. (as of June 2008) |
| macros = dict( # FreeBSD |
| @@ -1338,7 +1342,7 @@ class PyBuildExt(build_ext): |
| missing.append('linuxaudiodev') |
| |
| if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6', |
| - 'freebsd7', 'freebsd8'): |
| + 'freebsd7', 'freebsd8', 'freebsd9'): |
| exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) |
| else: |
| missing.append('ossaudiodev') |
