python/Python-2.6.1.patch

   1 --- misc/Python-2.6.1/Include/pyport.h  Wed Jun 11 09:41:16 2008
   2 +++ misc/build/Python-2.6.1/Include/pyport.h    Fri Apr 17 09:02:52 2009
   3 @@ -449,11 +449,6 @@
   4  in platform-specific #ifdefs.
   5  **************************************************************************/
   6
   7 -#ifdef SOLARIS
   8 -/* Unchecked */
   9 -extern int gethostname(char *, int);
  10 -#endif
  11 -
  12  #ifdef __BEOS__
  13  /* Unchecked */
  14  /* It's in the libs, but not the headers... - [cjh] */
  15 --- misc/Python-2.6.1/PCbuild/pcbuild.sln       2008-06-27 04:30:34.000000000 +0200
  16 +++ misc/build/Python-2.6.1/PCbuild/pcbuild.sln 2009-03-09 22:48:14.546329900 +0100
  17 @@ -38,12 +38,12 @@
  18                 {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
  19         EndProjectSection
  20  EndProject
  21 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}"
  22 -       ProjectSection(ProjectDependencies) = postProject
  23 -               {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
  24 -               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
  25 -       EndProjectSection
  26 -EndProject
  27 +#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}"
  28 +#      ProjectSection(ProjectDependencies) = postProject
  29 +#              {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
  30 +#              {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
  31 +#      EndProjectSection
  32 +#EndProject
  33  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcproj", "{0E9791DB-593A-465F-98BC-681011311618}"
  34         ProjectSection(ProjectDependencies) = postProject
  35                 {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
  36 @@ -69,34 +69,34 @@
  37                 {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
  38         EndProjectSection
  39  EndProject
  40 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{13CECB97-4119-4316-9D42-8534019A5A44}"
  41 -       ProjectSection(ProjectDependencies) = postProject
  42 -               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
  43 -               {A1A295E5-463C-437F-81CA-1F32367685DA} = {A1A295E5-463C-437F-81CA-1F32367685DA}
  44 -       EndProjectSection
  45 -EndProject
  46 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}"
  47 -       ProjectSection(ProjectDependencies) = postProject
  48 -               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
  49 -               {86937F53-C189-40EF-8CE8-8759D8E7D480} = {86937F53-C189-40EF-8CE8-8759D8E7D480}
  50 -               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
  51 -       EndProjectSection
  52 -EndProject
  53 +#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{13CECB97-4119-4316-9D42-8534019A5A44}"
  54 +#      ProjectSection(ProjectDependencies) = postProject
  55 +#              {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
  56 +#              {A1A295E5-463C-437F-81CA-1F32367685DA} = {A1A295E5-463C-437F-81CA-1F32367685DA}
  57 +#      EndProjectSection
  58 +#EndProject
  59 +#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}"
  60 +#      ProjectSection(ProjectDependencies) = postProject
  61 +#              {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
  62 +#              {86937F53-C189-40EF-8CE8-8759D8E7D480} = {86937F53-C189-40EF-8CE8-8759D8E7D480}
  63 +#              {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
  64 +#      EndProjectSection
  65 +#EndProject
  66  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testcapi", "_testcapi.vcproj", "{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}"
  67         ProjectSection(ProjectDependencies) = postProject
  68                 {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
  69         EndProjectSection
  70  EndProject
  71 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}"
  72 -       ProjectSection(ProjectDependencies) = postProject
  73 -               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
  74 -       EndProjectSection
  75 -EndProject
  76 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}"
  77 -       ProjectSection(ProjectDependencies) = postProject
  78 -               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
  79 -       EndProjectSection
  80 -EndProject
  81 +#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}"
  82 +#      ProjectSection(ProjectDependencies) = postProject
  83 +#              {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
  84 +#      EndProjectSection
  85 +#EndProject
  86 +#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}"
  87 +#      ProjectSection(ProjectDependencies) = postProject
  88 +#              {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
  89 +#      EndProjectSection
  90 +#EndProject
  91  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select.vcproj", "{18CAE28C-B454-46C1-87A0-493D91D97F03}"
  92         ProjectSection(ProjectDependencies) = postProject
  93                 {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
  94 @@ -114,17 +114,17 @@
  95  EndProject
  96  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "bdist_wininst.vcproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}"
  97  EndProject
  98 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}"
  99 -       ProjectSection(ProjectDependencies) = postProject
 100 -               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
 101 -               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
 102 -       EndProjectSection
 103 -EndProject
 104 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}"
 105 -       ProjectSection(ProjectDependencies) = postProject
 106 -               {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
 107 -       EndProjectSection
 108 -EndProject
 109 +#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}"
 110 +#ProjectSection(ProjectDependencies) = postProject
 111 +#              {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
 112 +#              {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
 113 +#      EndProjectSection
 114 +#EndProject
 115 +#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}"
 116 +#      ProjectSection(ProjectDependencies) = postProject
 117 +#              {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
 118 +#      EndProjectSection
 119 +#EndProject
 120  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}"
 121         ProjectSection(ProjectDependencies) = postProject
 122                 {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
 123 --- misc/Python-2.6.1/Lib/test/test_threading.py.bak    2009-03-12 07:59:17.000000000 +0000
 124 +++ misc/build/Python-2.6.1/Lib/test/test_threading.py  2009-03-12 10:48:04.000000000 +0000
 125 @@ -382,7 +382,7 @@
 126              return
 127          # Skip platforms with known problems forking from a worker thread.
 128          # See http://bugs.python.org/issue3863.
 129 -        if sys.platform in ('freebsd4', 'freebsd5', 'freebsd6', 'os2emx'):
 130 +        if sys.platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'os2emx'):
 131              print >>sys.stderr, ('Skipping test_3_join_in_forked_from_thread'
 132                                   ' due to known OS bugs on'), sys.platform
 133              return
 134
 135 --- misc/Python-2.6.1/Modules/_ctypes/libffi/configure.orig     2008-05-24 00:06:50.000000000 +0900
 136 +++ misc/build/Python-2.6.1/Modules/_ctypes/libffi/configure    2008-10-09 20:24:02.000000000 +0900
 137 @@ -4725,7 +4725,7 @@
 138    rm -rf conftest*
 139    ;;
 140
 141 -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
 142 +amd64-*-freebsd*|x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
 143  s390*-*linux*|sparc*-*linux*)
 144    # Find out which ABI we are using.
 145
 146 --- misc/Python-2.6.1/Python/thread_pthread.h.orig      2006-06-13 16:04:24.000000000 +0100
 147 +++ misc/build/Python-2.6.1/Python/thread_pthread.h     2009-03-12 10:55:49.000000000 +0000
 148 @@ -26,13 +26,18 @@
 149  #endif
 150  #endif
 151
 152 +#ifdef __FreeBSD__
 153 +#include <osreldate.h>
 154 +#endif
 155 +
 156  /* The POSIX spec says that implementations supporting the sem_*
 157     family of functions must indicate this by defining
 158     _POSIX_SEMAPHORES. */
 159  #ifdef _POSIX_SEMAPHORES
 160  /* On FreeBSD 4.x, _POSIX_SEMAPHORES is defined empty, so
 161     we need to add 0 to make it work there as well. */
 162 -#if (_POSIX_SEMAPHORES+0) == -1
 163 +#if defined(__FreeBSD__) && __FreeBSD_version < 701104 && \
 164 +    (_POSIX_SEMAPHORES+0) == -1
 165  #define HAVE_BROKEN_POSIX_SEMAPHORES
 166  #else
 167  #include <semaphore.h>
 168 @@ -44,7 +49,6 @@
 169     in default setting.  So the process scope is preferred to get
 170     enough number of threads to work. */
 171  #ifdef __FreeBSD__
 172 -#include <osreldate.h>
 173  #if __FreeBSD_version >= 500000 && __FreeBSD_version < 504101
 174  #undef PTHREAD_SYSTEM_SCHED_SUPPORTED
 175  #endif
 176 @@ -149,6 +153,9 @@
 177  {
 178         pthread_t th;
 179         int status;
 180 +#ifdef __FreeBSD__
 181 +       sigset_t set, oset;
 182 +#endif
 183  #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
 184         pthread_attr_t attrs;
 185  #endif
 186 @@ -177,7 +184,10 @@
 187  #if defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
 188          pthread_attr_setscope(&attrs, PTHREAD_SCOPE_SYSTEM);
 189  #endif
 190 -
 191 +#ifdef __FreeBSD__
 192 +       sigfillset(&set);
 193 +       SET_THREAD_SIGMASK(SIG_BLOCK, &set, &oset);
 194 +#endif
 195         status = pthread_create(&th,
 196  #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
 197                                  &attrs,
 198 @@ -188,6 +198,9 @@
 199                                  (void *)arg
 200                                  );
 201
 202 +#ifdef __FreeBSD__
 203 +       SET_THREAD_SIGMASK(SIG_SETMASK, &oset, NULL);
 204 +#endif
 205  #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
 206         pthread_attr_destroy(&attrs);
 207  #endif
 208 --- misc/Python-2.6.1/configure 2008-11-17 02:57:10.000000000 +0900
 209 +++ misc/build/Python-2.6.1/configure   2009-03-23 21:18:42.000000000 +0900
 210 @@ -4110,11 +4110,6 @@
 211           LDLIBRARY='libpython$(VERSION).so'
 212           BLDLIBRARY='-L. -lpython$(VERSION)'
 213           RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
 214 -         case $ac_sys_system in
 215 -             FreeBSD*)
 216 -               SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
 217 -               ;;
 218 -         esac
 219           INSTSONAME="$LDLIBRARY".$SOVERSION
 220           ;;
 221      hp*|HP*)
 222 --- misc/Python-2.6.1/configure Sun Nov 16 18:57:10 2008
 223 +++ misc/build/Python-2.6.1/configure   Thu Apr 16 15:16:03 2009
 224 @@ -4102,7 +4102,7 @@
 225            ;;
 226      SunOS*)
 227           LDLIBRARY='libpython$(VERSION).so'
 228 -         BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(VERSION)'
 229 +         BLDLIBRARY=-R\'\$\$ORIGIN\'' -L. -lpython$(VERSION)'
 230           RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
 231           INSTSONAME="$LDLIBRARY".$SOVERSION
 232            ;;