openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1478650 - in /openoffice/trunk/main: ./ python/ python/prj/
Date Fri, 03 May 2013 05:53:32 GMT
Author: jsc
Date: Fri May  3 05:53:32 2013
New Revision: 1478650

URL: http://svn.apache.org/r1478650
Log:
#122010# update python to ver 2.7.4

Added:
    openoffice/trunk/main/python/python-2.7.4-nohardlink.patch
    openoffice/trunk/main/python/python-2.7.4-pcbuild.patch
    openoffice/trunk/main/python/python-2.7.4-sysbase.patch
Removed:
    openoffice/trunk/main/python/python-2.7.3-nohardlink.patch
    openoffice/trunk/main/python/python-2.7.3-pcbuild.patch
    openoffice/trunk/main/python/python-2.7.3-sysbase.patch
Modified:
    openoffice/trunk/main/external_deps.lst
    openoffice/trunk/main/python/makefile.mk
    openoffice/trunk/main/python/prj/d.lst
    openoffice/trunk/main/python/python-freebsd.patch
    openoffice/trunk/main/python/python-md5.patch
    openoffice/trunk/main/python/python-solaris.patch
    openoffice/trunk/main/python/python-ssl.patch
    openoffice/trunk/main/python/pyversion.mk

Modified: openoffice/trunk/main/external_deps.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/external_deps.lst?rev=1478650&r1=1478649&r2=1478650&view=diff
==============================================================================
--- openoffice/trunk/main/external_deps.lst (original)
+++ openoffice/trunk/main/external_deps.lst Fri May  3 05:53:32 2013
@@ -217,9 +217,9 @@ if (ENABLE_MEDIAWIKI == YES)
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_PYTHON != YES)
-    MD5 = c57477edd6d18bd9eeca2f21add73919
-    name = Python-2.7.3.tar.bz2
-    URL1 = http://www.python.org/ftp/python/2.7.3/Python-2.7.3.tar.bz2
+    MD5 = 62704ea0f125923208d84ff0568f7d50
+    name = Python-2.7.4.tar.bz2
+    URL1 = http://www.python.org/ftp/python/2.7.4/Python-2.7.4.tar.bz2
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_BOOST!=YES || (OS==SOLARIS && COM!=GCC))

Modified: openoffice/trunk/main/python/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/python/makefile.mk?rev=1478650&r1=1478649&r2=1478650&view=diff
==============================================================================
--- openoffice/trunk/main/python/makefile.mk (original)
+++ openoffice/trunk/main/python/makefile.mk Fri May  3 05:53:32 2013
@@ -42,7 +42,7 @@ all:
 
 
 TARFILE_NAME=Python-$(PYVERSION)
-TARFILE_MD5=c57477edd6d18bd9eeca2f21add73919
+TARFILE_MD5=62704ea0f125923208d84ff0568f7d50
 PATCH_FILES=\
 	python-solaris.patch \
 	python-freebsd.patch \

Modified: openoffice/trunk/main/python/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/python/prj/d.lst?rev=1478650&r1=1478649&r2=1478650&view=diff
==============================================================================
--- openoffice/trunk/main/python/prj/d.lst (original)
+++ openoffice/trunk/main/python/prj/d.lst Fri May  3 05:53:32 2013
@@ -36,51 +36,51 @@ mkdir: %_DEST%\lib%_EXT%\python\multipro
 mkdir: %_DEST%\lib%_EXT%\python\unittest
 mkdir: %_DEST%\lib%_EXT%\python\python2.7\config
 
-..\%__SRC%\misc\build\Python-2.7.3\Lib\* %_DEST%\lib%_EXT%\python\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\lib-old\* %_DEST%\lib%_EXT%\python\lib-old\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\lib-tk\* %_DEST%\lib%_EXT%\python\lib-tk\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\email\* %_DEST%\lib%_EXT%\python\email\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\compiler\* %_DEST%\lib%_EXT%\python\compiler\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\hotshot\* %_DEST%\lib%_EXT%\python\hotshot\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\distutils\* %_DEST%\lib%_EXT%\python\distutils\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\distutils\command\* %_DEST%\lib%_EXT%\python\distutils\command\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\xml\dom\* %_DEST%\lib%_EXT%\python\xml\dom\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\xml\parsers\* %_DEST%\lib%_EXT%\python\xml\parsers\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\xml\sax\* %_DEST%\lib%_EXT%\python\xml\sax\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\curses\* %_DEST%\lib%_EXT%\python\curses\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\plat-linux2\* %_DEST%\lib%_EXT%\python\plat-linux2\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\config\* %_DEST%\lib%_EXT%\python\config\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\logging\* %_DEST%\lib%_EXT%\python\logging\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\idlelib\* %_DEST%\lib%_EXT%\python\idlelib\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\idlelib\Icons\* %_DEST%\lib%_EXT%\python\idlelib\Icons\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\wsgiref\* %_DEST%\lib%_EXT%\python\wsgiref\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\json\* %_DEST%\lib%_EXT%\python\json\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\lib2to3\* %_DEST%\lib%_EXT%\python\lib2to3\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\lib2to3\fixes\* %_DEST%\lib%_EXT%\python\lib2to3\fixes\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\lib2to3\pgen2\* %_DEST%\lib%_EXT%\python\lib2to3\pgen2\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\sqlite3\* %_DEST%\lib%_EXT%\python\sqlite3\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\ctypes\* %_DEST%\lib%_EXT%\python\ctypes\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\ctypes\macholib\* %_DEST%\lib%_EXT%\python\ctypes\macholib\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree
-..\%__SRC%\misc\build\Python-2.7.3\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree
-..\%__SRC%\misc\build\Python-2.7.3\Lib\importlib\* %_DEST%\lib%_EXT%\python\importlib\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\multiprocessing\* %_DEST%\lib%_EXT%\python\multiprocessing\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\multiprocessing\dummy\* %_DEST%\lib%_EXT%\python\multiprocessing\dummy\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\unittest\* %_DEST%\lib%_EXT%\python\unittest\*
-..\%__SRC%\misc\build\Python-2.7.3\Makefile %_DEST%\lib%_EXT%\python\python2.7\config\Makefile
+..\%__SRC%\misc\build\Python-2.7.4\Lib\* %_DEST%\lib%_EXT%\python\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\lib-old\* %_DEST%\lib%_EXT%\python\lib-old\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\lib-tk\* %_DEST%\lib%_EXT%\python\lib-tk\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\email\* %_DEST%\lib%_EXT%\python\email\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\compiler\* %_DEST%\lib%_EXT%\python\compiler\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\hotshot\* %_DEST%\lib%_EXT%\python\hotshot\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\distutils\* %_DEST%\lib%_EXT%\python\distutils\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\distutils\command\* %_DEST%\lib%_EXT%\python\distutils\command\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\xml\dom\* %_DEST%\lib%_EXT%\python\xml\dom\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\xml\parsers\* %_DEST%\lib%_EXT%\python\xml\parsers\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\xml\sax\* %_DEST%\lib%_EXT%\python\xml\sax\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\curses\* %_DEST%\lib%_EXT%\python\curses\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\plat-linux2\* %_DEST%\lib%_EXT%\python\plat-linux2\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\config\* %_DEST%\lib%_EXT%\python\config\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\logging\* %_DEST%\lib%_EXT%\python\logging\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\idlelib\* %_DEST%\lib%_EXT%\python\idlelib\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\idlelib\Icons\* %_DEST%\lib%_EXT%\python\idlelib\Icons\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\wsgiref\* %_DEST%\lib%_EXT%\python\wsgiref\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\json\* %_DEST%\lib%_EXT%\python\json\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\lib2to3\* %_DEST%\lib%_EXT%\python\lib2to3\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\lib2to3\fixes\* %_DEST%\lib%_EXT%\python\lib2to3\fixes\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\lib2to3\pgen2\* %_DEST%\lib%_EXT%\python\lib2to3\pgen2\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\sqlite3\* %_DEST%\lib%_EXT%\python\sqlite3\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\ctypes\* %_DEST%\lib%_EXT%\python\ctypes\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\ctypes\macholib\* %_DEST%\lib%_EXT%\python\ctypes\macholib\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree
+..\%__SRC%\misc\build\Python-2.7.4\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree
+..\%__SRC%\misc\build\Python-2.7.4\Lib\importlib\* %_DEST%\lib%_EXT%\python\importlib\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\multiprocessing\* %_DEST%\lib%_EXT%\python\multiprocessing\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\multiprocessing\dummy\* %_DEST%\lib%_EXT%\python\multiprocessing\dummy\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\unittest\* %_DEST%\lib%_EXT%\python\unittest\*
+..\%__SRC%\misc\build\Python-2.7.4\Makefile %_DEST%\lib%_EXT%\python\python2.7\config\Makefile
 
 ..\pyversion.mk %_DEST%\inc%_EXT%\pyversion.mk
 
-..\%__SRC%\misc\build\Python-2.7.3\Include\* %_DEST%\inc%_EXT%\python\*
+..\%__SRC%\misc\build\Python-2.7.4\Include\* %_DEST%\inc%_EXT%\python\*
 
 #unix ONLY !
 ..\%__SRC%\misc\build\python-inst\bin\python %_DEST%\bin%_EXT%\python
-..\%__SRC%\misc\build\Python-2.7.3\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h
+..\%__SRC%\misc\build\Python-2.7.4\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h
 ..\%__SRC%\misc\build\python-inst\lib\python2.7\lib-dynload\* %_DEST%\lib%_EXT%\python\lib-dynload\*
 ..\%__SRC%\misc\build\python-inst\bin\python2.7 %_DEST%\bin%_EXT%\python
 ..\%__SRC%\misc\build\python-inst\lib\libpython2.7.so.1.0 %_DEST%\lib%_EXT%\libpython2.7.so.1.0
@@ -91,24 +91,24 @@ symlink: %_DEST%\lib%_EXT%\libpython2.7.
 
 #MingW ONLY !
 ..\%__SRC%\misc\build\python-inst\bin\python.exe %_DEST%\bin%_EXT%\python.exe
-..\%__SRC%\misc\build\Python-2.7.3\libpython2.7.dll %_DEST%\bin%_EXT%\libpython2.7.dll
+..\%__SRC%\misc\build\Python-2.7.4\libpython2.7.dll %_DEST%\bin%_EXT%\libpython2.7.dll
 
 # WINDOWS ONLY !
 ..\%__SRC%\misc\build\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\python.exe %_DEST%\bin%_EXT%\python.exe
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\python27.dll %_DEST%\bin%_EXT%\python27.dll
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\python27.lib %_DEST%\lib%_EXT%\python27.lib
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\select.pyd %_DEST%\lib%_EXT%\python\select.pyd
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\python.exe %_DEST%\bin%_EXT%\python.exe
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\python27.dll %_DEST%\bin%_EXT%\python27.dll
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\python27.lib %_DEST%\lib%_EXT%\python27.lib
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\select.pyd %_DEST%\lib%_EXT%\python\select.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd
 
 #linklib: libpython.so.*.*.*
 

Added: openoffice/trunk/main/python/python-2.7.4-nohardlink.patch
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-2.7.4-nohardlink.patch?rev=1478650&view=auto
==============================================================================
--- openoffice/trunk/main/python/python-2.7.4-nohardlink.patch (added)
+++ openoffice/trunk/main/python/python-2.7.4-nohardlink.patch Fri May  3 05:53:32 2013
@@ -0,0 +1,11 @@
+--- misc/Python-2.7.4/Makefile.pre.in	2012-04-09 18:07:33.000000000 -0500
++++ misc/build/Python-2.7.4/Makefile.pre.in	2012-07-22 14:54:26.000000000 -0500
+@@ -427,7 +427,7 @@
+ libpython$(VERSION).so: $(LIBRARY_OBJS)
+ 	if test $(INSTSONAME) != $(LDLIBRARY); then \
+ 		$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
+-		$(LN) -f $(INSTSONAME) $@; \
++		$(LN) -fs $(INSTSONAME) $@; \
+ 	else \
+ 		$(BLDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
+ 	fi

Added: openoffice/trunk/main/python/python-2.7.4-pcbuild.patch
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-2.7.4-pcbuild.patch?rev=1478650&view=auto
==============================================================================
--- openoffice/trunk/main/python/python-2.7.4-pcbuild.patch (added)
+++ openoffice/trunk/main/python/python-2.7.4-pcbuild.patch Fri May  3 05:53:32 2013
@@ -0,0 +1,1778 @@
+diff -u misc/Python-2.7.4/PCbuild/_bsddb.vcproj misc/build/Python-2.7.4/PCbuild/_bsddb.vcproj
+--- misc/Python-2.7.4/PCbuild/_bsddb.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/_bsddb.vcproj	2012-07-30 20:59:37.000000000 -0500
+@@ -56,6 +56,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 				AdditionalDependencies="$(bsddbDepLibs)"
+ 				BaseAddress="0x1e180000"
+ 			/>
+@@ -120,6 +121,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 				AdditionalDependencies="$(bsddbDepLibs)"
+ 				BaseAddress="0x1e180000"
+ 			/>
+@@ -183,6 +185,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 				AdditionalDependencies="$(bsddbDepLibs)"
+ 				BaseAddress="0x1e180000"
+ 			/>
+@@ -248,6 +251,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 				AdditionalDependencies="$(bsddbDepLibs)"
+ 				BaseAddress="0x1e180000"
+ 			/>
+@@ -311,6 +315,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 				AdditionalDependencies="$(bsddbDepLibs)"
+ 				BaseAddress="0x1e180000"
+ 			/>
+@@ -375,6 +380,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 				AdditionalDependencies="$(bsddbDepLibs)"
+ 				BaseAddress="0x1e180000"
+ 				TargetMachine="17"
+@@ -439,6 +445,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 				AdditionalDependencies="$(bsddbDepLibs)"
+ 				BaseAddress="0x1e180000"
+ 			/>
+@@ -503,6 +510,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 				AdditionalDependencies="$(bsddbDepLibs)"
+ 				BaseAddress="0x1e180000"
+ 				TargetMachine="17"
+diff -u misc/Python-2.7.4/PCbuild/_ctypes.vcproj misc/build/Python-2.7.4/PCbuild/_ctypes.vcproj
+--- misc/Python-2.7.4/PCbuild/_ctypes.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/_ctypes.vcproj	2012-07-30 20:59:37.000000000 -0500
+@@ -177,7 +177,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+-				AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
++				AdditionalOptions="/SAFESEH /DYNAMICBASE /NXCOMPAT /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
+ 				SubSystem="0"
+ 				BaseAddress="0x1D1A0000"
+ 			/>
+@@ -241,7 +241,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+-				AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
++				AdditionalOptions="/SAFESEH /DYNAMICBASE /NXCOMPAT /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
+ 				SubSystem="0"
+ 				BaseAddress="0x1D1A0000"
+ 			/>
+@@ -304,7 +304,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+-				AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
++				AdditionalOptions="/SAFESEH /DYNAMICBASE /NXCOMPAT /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
+ 				SubSystem="0"
+ 				BaseAddress="0x1D1A0000"
+ 			/>
+@@ -368,7 +368,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+-				AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
++				AdditionalOptions="/SAFESEH /DYNAMICBASE /NXCOMPAT /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
+ 				SubSystem="0"
+ 				BaseAddress="0x1D1A0000"
+ 				TargetMachine="17"
+@@ -432,7 +432,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+-				AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
++				AdditionalOptions="/SAFESEH /DYNAMICBASE /NXCOMPAT /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
+ 				SubSystem="0"
+ 				BaseAddress="0x1D1A0000"
+ 			/>
+@@ -496,7 +496,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+-				AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
++				AdditionalOptions="/SAFESEH /DYNAMICBASE /NXCOMPAT /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
+ 				SubSystem="0"
+ 				BaseAddress="0x1D1A0000"
+ 				TargetMachine="17"
+diff -u misc/Python-2.7.4/PCbuild/_ctypes_test.vcproj misc/build/Python-2.7.4/PCbuild/_ctypes_test.vcproj
+--- misc/Python-2.7.4/PCbuild/_ctypes_test.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/_ctypes_test.vcproj	2012-07-30 20:59:37.000000000 -0500
+@@ -54,6 +54,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -113,6 +114,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -172,6 +174,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -232,6 +235,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -291,6 +295,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -352,6 +357,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -411,6 +417,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -472,6 +479,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.4/PCbuild/_elementtree.vcproj misc/build/Python-2.7.4/PCbuild/_elementtree.vcproj
+--- misc/Python-2.7.4/PCbuild/_elementtree.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/_elementtree.vcproj	2012-07-30 20:59:37.000000000 -0500
+@@ -57,6 +57,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D100000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -119,6 +120,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D100000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -181,6 +183,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D100000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -244,6 +247,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D100000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -306,6 +310,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D100000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -370,6 +375,7 @@
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D100000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -432,6 +438,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D100000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -496,6 +503,7 @@
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D100000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.4/PCbuild/_hashlib.vcproj misc/build/Python-2.7.4/PCbuild/_hashlib.vcproj
+--- misc/Python-2.7.4/PCbuild/_hashlib.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/_hashlib.vcproj	2012-07-30 20:59:37.000000000 -0500
+@@ -58,6 +58,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -121,6 +122,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -184,6 +186,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -248,6 +251,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -311,6 +315,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -376,6 +381,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -439,6 +445,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -504,6 +511,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.4/PCbuild/_msi.vcproj misc/build/Python-2.7.4/PCbuild/_msi.vcproj
+--- misc/Python-2.7.4/PCbuild/_msi.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/_msi.vcproj	2012-07-30 20:59:37.000000000 -0500
+@@ -56,6 +56,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
+ 				BaseAddress="0x1D160000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -117,6 +118,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
+ 				BaseAddress="0x1D160000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -178,6 +180,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
+ 				BaseAddress="0x1D160000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -240,6 +243,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
+ 				BaseAddress="0x1D160000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -301,6 +305,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
+ 				BaseAddress="0x1D160000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -364,6 +369,7 @@
+ 				AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
+ 				BaseAddress="0x1D160000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -425,6 +431,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
+ 				BaseAddress="0x1D160000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -488,6 +495,7 @@
+ 				AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
+ 				BaseAddress="0x1D160000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.4/PCbuild/_multiprocessing.vcproj misc/build/Python-2.7.4/PCbuild/_multiprocessing.vcproj
+--- misc/Python-2.7.4/PCbuild/_multiprocessing.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/_multiprocessing.vcproj	2012-07-30 20:59:37.000000000 -0500
+@@ -56,6 +56,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib"
+ 				BaseAddress="0x1e1D0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -117,6 +118,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib"
+ 				BaseAddress="0x1e1D0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -178,6 +180,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib"
+ 				BaseAddress="0x1e1D0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -240,6 +243,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib"
+ 				BaseAddress="0x1e1D0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -301,6 +305,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib"
+ 				BaseAddress="0x1e1D0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -364,6 +369,7 @@
+ 				AdditionalDependencies="ws2_32.lib"
+ 				BaseAddress="0x1e1D0000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -425,6 +431,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib"
+ 				BaseAddress="0x1e1D0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -488,6 +495,7 @@
+ 				AdditionalDependencies="ws2_32.lib"
+ 				BaseAddress="0x1e1D0000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.4/PCbuild/_socket.vcproj misc/build/Python-2.7.4/PCbuild/_socket.vcproj
+--- misc/Python-2.7.4/PCbuild/_socket.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/_socket.vcproj	2012-07-30 20:59:37.000000000 -0500
+@@ -56,6 +56,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib"
+ 				BaseAddress="0x1e1D0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -117,6 +118,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib"
+ 				BaseAddress="0x1e1D0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -178,6 +180,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib"
+ 				BaseAddress="0x1e1D0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -240,6 +243,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib"
+ 				BaseAddress="0x1e1D0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -301,6 +305,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib"
+ 				BaseAddress="0x1e1D0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -364,6 +369,7 @@
+ 				AdditionalDependencies="ws2_32.lib"
+ 				BaseAddress="0x1e1D0000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -425,6 +431,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib"
+ 				BaseAddress="0x1e1D0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -488,6 +495,7 @@
+ 				AdditionalDependencies="ws2_32.lib"
+ 				BaseAddress="0x1e1D0000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.4/PCbuild/_sqlite3.vcproj misc/build/Python-2.7.4/PCbuild/_sqlite3.vcproj
+--- misc/Python-2.7.4/PCbuild/_sqlite3.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/_sqlite3.vcproj	2012-07-30 20:59:37.000000000 -0500
+@@ -57,6 +57,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1e180000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -119,6 +120,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1e180000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -181,6 +183,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1e180000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -244,6 +247,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1e180000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -306,6 +310,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1e180000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -370,6 +375,7 @@
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1e180000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -432,6 +438,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1e180000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -496,6 +503,7 @@
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1e180000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.4/PCbuild/_ssl.vcproj misc/build/Python-2.7.4/PCbuild/_ssl.vcproj
+--- misc/Python-2.7.4/PCbuild/_ssl.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/_ssl.vcproj	2012-07-30 20:59:37.000000000 -0500
+@@ -43,7 +43,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCCLCompilerTool"
+-				AdditionalIncludeDirectories="$(opensslDir)\inc32"
++				AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
+ 			/>
+ 			<Tool
+ 				Name="VCManagedResourceCompilerTool"
+@@ -57,7 +57,8 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+-				AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
++				AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -106,7 +107,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCCLCompilerTool"
+-				AdditionalIncludeDirectories="$(opensslDir)\inc64"
++				AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
+ 			/>
+ 			<Tool
+ 				Name="VCManagedResourceCompilerTool"
+@@ -120,7 +121,8 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+-				AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
++				AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -169,7 +171,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCCLCompilerTool"
+-				AdditionalIncludeDirectories="$(opensslDir)\inc32"
++				AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
+ 			/>
+ 			<Tool
+ 				Name="VCManagedResourceCompilerTool"
+@@ -183,7 +185,8 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+-				AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
++				AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -233,7 +236,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCCLCompilerTool"
+-				AdditionalIncludeDirectories="$(opensslDir)\inc64"
++				AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
+ 			/>
+ 			<Tool
+ 				Name="VCManagedResourceCompilerTool"
+@@ -247,7 +250,8 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+-				AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
++				AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -296,7 +300,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCCLCompilerTool"
+-				AdditionalIncludeDirectories="$(opensslDir)\inc32"
++				AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
+ 			/>
+ 			<Tool
+ 				Name="VCManagedResourceCompilerTool"
+@@ -310,7 +314,8 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+-				AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
++				AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -360,7 +365,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCCLCompilerTool"
+-				AdditionalIncludeDirectories="$(opensslDir)\inc64"
++				AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
+ 			/>
+ 			<Tool
+ 				Name="VCManagedResourceCompilerTool"
+@@ -374,7 +379,8 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+-				AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
++				AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
+ 				TargetMachine="17"
+ 			/>
+ 			<Tool
+@@ -424,7 +430,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCCLCompilerTool"
+-				AdditionalIncludeDirectories="$(opensslDir)\inc32"
++				AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
+ 			/>
+ 			<Tool
+ 				Name="VCManagedResourceCompilerTool"
+@@ -438,7 +444,8 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+-				AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
++				AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -488,7 +495,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCCLCompilerTool"
+-				AdditionalIncludeDirectories="$(opensslDir)\inc64"
++				AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
+ 			/>
+ 			<Tool
+ 				Name="VCManagedResourceCompilerTool"
+@@ -502,7 +509,8 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+-				AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
++				AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
+ 				TargetMachine="17"
+ 			/>
+ 			<Tool
+diff -u misc/Python-2.7.4/PCbuild/_testcapi.vcproj misc/build/Python-2.7.4/PCbuild/_testcapi.vcproj
+--- misc/Python-2.7.4/PCbuild/_testcapi.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/_testcapi.vcproj	2012-07-30 20:59:37.000000000 -0500
+@@ -55,6 +55,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1e1F0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -115,6 +116,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1e1F0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -175,6 +177,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1e1F0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -236,6 +239,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1e1F0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -296,6 +300,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1e1F0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -358,6 +363,7 @@
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1e1F0000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -418,6 +424,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1e1F0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -480,6 +487,7 @@
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1e1F0000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.4/PCbuild/_tkinter.vcproj misc/build/Python-2.7.4/PCbuild/_tkinter.vcproj
+--- misc/Python-2.7.4/PCbuild/_tkinter.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/_tkinter.vcproj	2012-07-30 20:59:37.000000000 -0500
+@@ -57,6 +57,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="$(tcltkLibDebug)"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -119,6 +120,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="$(tcltk64LibDebug)"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -181,6 +183,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="$(tcltkLib)"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -244,6 +247,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="$(tcltk64Lib)"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -306,6 +310,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="$(tcltkLib)"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -370,6 +375,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="$(tcltk64Lib)"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -432,6 +438,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="$(tcltkLib)"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -496,6 +503,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="$(tcltk64Lib)"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.4/PCbuild/bdist_wininst.vcproj misc/build/Python-2.7.4/PCbuild/bdist_wininst.vcproj
+--- misc/Python-2.7.4/PCbuild/bdist_wininst.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/bdist_wininst.vcproj	2012-07-30 20:59:37.000000000 -0500
+@@ -81,8 +81,7 @@
+ 				IgnoreDefaultLibraryNames="LIBC"
+ 				ProgramDatabaseFile="..\lib\distutils\command\wininst-9.0.pdb"
+ 				SubSystem="2"
+-				RandomizedBaseAddress="1"
+-				DataExecutionPrevention="0"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 				TargetMachine="1"
+ 			/>
+ 			<Tool
+@@ -171,8 +170,7 @@
+ 				IgnoreDefaultLibraryNames="LIBC"
+ 				ProgramDatabaseFile="..\lib\distutils\command\wininst-9.0-amd64.pdb"
+ 				SubSystem="2"
+-				RandomizedBaseAddress="1"
+-				DataExecutionPrevention="0"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 				TargetMachine="17"
+ 			/>
+ 			<Tool
+diff -u misc/Python-2.7.4/PCbuild/bz2.vcproj misc/build/Python-2.7.4/PCbuild/bz2.vcproj
+--- misc/Python-2.7.4/PCbuild/bz2.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/bz2.vcproj	2012-07-30 20:59:37.000000000 -0500
+@@ -57,6 +57,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D170000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -119,6 +120,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D170000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -181,6 +183,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D170000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -244,6 +247,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D170000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -306,6 +310,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D170000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -370,6 +375,7 @@
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D170000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -432,6 +438,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D170000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -496,6 +503,7 @@
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D170000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.4/PCbuild/kill_python.vcproj misc/build/Python-2.7.4/PCbuild/kill_python.vcproj
+--- misc/Python-2.7.4/PCbuild/kill_python.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/kill_python.vcproj	2012-07-30 20:59:37.000000000 -0500
+@@ -56,6 +56,7 @@
+ 				Name="VCLinkerTool"
+ 				OutputFile="$(OutDir)\$(ProjectName)_d.exe"
+ 				SubSystem="1"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -117,6 +118,7 @@
+ 				Name="VCLinkerTool"
+ 				OutputFile="$(OutDir)\$(ProjectName)_d.exe"
+ 				SubSystem="1"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -177,6 +179,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				SubSystem="1"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -238,6 +241,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				SubSystem="1"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.4/PCbuild/make_buildinfo.vcproj misc/build/Python-2.7.4/PCbuild/make_buildinfo.vcproj
+--- misc/Python-2.7.4/PCbuild/make_buildinfo.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/make_buildinfo.vcproj	2012-07-30 20:59:37.000000000 -0500
+@@ -61,6 +61,7 @@
+ 				OutputFile="$(OutDir)/make_buildinfo.exe"
+ 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
+ 				SubSystem="1"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -119,6 +120,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.4/PCbuild/make_versioninfo.vcproj misc/build/Python-2.7.4/PCbuild/make_versioninfo.vcproj
+--- misc/Python-2.7.4/PCbuild/make_versioninfo.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/make_versioninfo.vcproj	2012-07-30 20:59:37.000000000 -0500
+@@ -71,6 +71,7 @@
+ 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
+ 				SubSystem="1"
+ 				BaseAddress="0x1d000000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -137,6 +138,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				OutputFile="$(SolutionDir)make_versioninfo.exe"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -214,6 +216,7 @@
+ 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
+ 				SubSystem="1"
+ 				BaseAddress="0x1d000000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -282,6 +285,7 @@
+ 				Name="VCLinkerTool"
+ 				OutputFile="$(SolutionDir)make_versioninfo_d.exe"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.4/PCbuild/pcbuild.sln misc/build/Python-2.7.4/PCbuild/pcbuild.sln
+--- misc/Python-2.7.4/PCbuild/pcbuild.sln	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/pcbuild.sln	2012-07-30 21:04:33.000000000 -0500
+@@ -38,17 +38,17 @@
+ 		{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}
+-	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}
++#	EndProjectSection
++#EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes_test", "_ctypes_test.vcproj", "{9EC7190A-249F-4180-A900-548FDCF3055F}"
+ 	ProjectSection(ProjectDependencies) = postProject
+ 		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+@@ -69,12 +69,12 @@
+ 		{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}") = "_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}
+@@ -87,16 +87,16 @@
+ 		{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}
+diff -u misc/Python-2.7.4/PCbuild/pyexpat.vcproj misc/build/Python-2.7.4/PCbuild/pyexpat.vcproj
+--- misc/Python-2.7.4/PCbuild/pyexpat.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/pyexpat.vcproj	2012-07-30 20:59:37.000000000 -0500
+@@ -56,6 +56,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -117,6 +118,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -178,6 +180,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -240,6 +243,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -301,6 +305,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -364,6 +369,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -425,6 +431,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -488,6 +495,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.4/PCbuild/python.vcproj misc/build/Python-2.7.4/PCbuild/python.vcproj
+--- misc/Python-2.7.4/PCbuild/python.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/python.vcproj	2012-07-30 20:59:37.000000000 -0500
+@@ -66,6 +66,7 @@
+ 				SubSystem="1"
+ 				StackReserveSize="2000000"
+ 				BaseAddress="0x1d000000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -139,6 +140,7 @@
+ 				SubSystem="1"
+ 				StackReserveSize="2000000"
+ 				BaseAddress="0x1d000000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -213,6 +215,7 @@
+ 				SubSystem="1"
+ 				StackReserveSize="2000000"
+ 				BaseAddress="0x1d000000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -288,6 +291,7 @@
+ 				SubSystem="1"
+ 				StackReserveSize="2100000"
+ 				BaseAddress="0x1d000000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -361,6 +365,7 @@
+ 				StackReserveSize="2000000"
+ 				BaseAddress="0x1d000000"
+ 				ImportLibrary=""
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -436,6 +441,7 @@
+ 				BaseAddress="0x1d000000"
+ 				ImportLibrary=""
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -509,6 +515,7 @@
+ 				StackReserveSize="2000000"
+ 				BaseAddress="0x1d000000"
+ 				ImportLibrary=""
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -584,6 +591,7 @@
+ 				BaseAddress="0x1d000000"
+ 				ImportLibrary=""
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.4/PCbuild/pythoncore.vcproj misc/build/Python-2.7.4/PCbuild/pythoncore.vcproj
+--- misc/Python-2.7.4/PCbuild/pythoncore.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/pythoncore.vcproj	2012-07-30 20:59:37.000000000 -0500
+@@ -69,6 +69,7 @@
+ 				ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
+ 				BaseAddress="0x1e000000"
+ 				ImportLibrary="$(OutDir)$(PyDllName).lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -144,6 +145,7 @@
+ 				ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
+ 				BaseAddress="0x1e000000"
+ 				ImportLibrary="$(OutDir)$(PyDllName).lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -222,6 +224,7 @@
+ 				ProgramDatabaseFile="$(OutDir)$(PyDllName)_d.pdb"
+ 				BaseAddress="0x1e000000"
+ 				ImportLibrary="$(OutDir)$(PyDllName)_d.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -300,6 +303,7 @@
+ 				ProgramDatabaseFile="$(OutDir)$(PyDllName)_d.pdb"
+ 				BaseAddress="0x1e000000"
+ 				ImportLibrary="$(OutDir)$(PyDllName)_d.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -374,6 +378,7 @@
+ 				ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
+ 				BaseAddress="0x1e000000"
+ 				ImportLibrary="$(OutDirPGI)$(PyDllName).lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -450,6 +455,7 @@
+ 				BaseAddress="0x1e000000"
+ 				ImportLibrary="$(OutDirPGI)$(PyDllName).lib"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -524,6 +530,7 @@
+ 				ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
+ 				BaseAddress="0x1e000000"
+ 				ImportLibrary="$(OutDirPGI)$(PyDllName).lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -600,6 +607,7 @@
+ 				BaseAddress="0x1e000000"
+ 				ImportLibrary="$(OutDirPGI)$(PyDllName).lib"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -1874,4 +1882,4 @@
+ 	</Files>
+ 	<Globals>
+ 	</Globals>
+-</VisualStudioProject>
+\ No newline at end of file
++</VisualStudioProject>
+diff -u misc/Python-2.7.4/PCbuild/pythonw.vcproj misc/build/Python-2.7.4/PCbuild/pythonw.vcproj
+--- misc/Python-2.7.4/PCbuild/pythonw.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/pythonw.vcproj	2012-07-30 20:59:37.000000000 -0500
+@@ -66,6 +66,7 @@
+ 				StackReserveSize="2000000"
+ 				BaseAddress="0x1d000000"
+ 				TargetMachine="1"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -137,6 +138,7 @@
+ 				OutputFile="$(OutDir)\pythonw_d.exe"
+ 				StackReserveSize="2000000"
+ 				BaseAddress="0x1d000000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -208,6 +210,7 @@
+ 				StackReserveSize="2000000"
+ 				BaseAddress="0x1d000000"
+ 				TargetMachine="1"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -279,6 +282,7 @@
+ 				OutputFile="$(OutDir)\pythonw.exe"
+ 				StackReserveSize="2000000"
+ 				BaseAddress="0x1d000000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -351,6 +355,7 @@
+ 				BaseAddress="0x1d000000"
+ 				ImportLibrary=""
+ 				TargetMachine="1"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -424,6 +429,7 @@
+ 				BaseAddress="0x1d000000"
+ 				ImportLibrary=""
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -496,6 +502,7 @@
+ 				BaseAddress="0x1d000000"
+ 				ImportLibrary=""
+ 				TargetMachine="1"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -569,6 +576,7 @@
+ 				BaseAddress="0x1d000000"
+ 				ImportLibrary=""
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.4/PCbuild/select.vcproj misc/build/Python-2.7.4/PCbuild/select.vcproj
+--- misc/Python-2.7.4/PCbuild/select.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/select.vcproj	2012-07-30 20:59:37.000000000 -0500
+@@ -57,6 +57,7 @@
+ 				AdditionalDependencies="ws2_32.lib"
+ 				IgnoreDefaultLibraryNames="libc"
+ 				BaseAddress="0x1D110000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -119,6 +120,7 @@
+ 				AdditionalDependencies="ws2_32.lib"
+ 				IgnoreDefaultLibraryNames="libc"
+ 				BaseAddress="0x1D110000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -181,6 +183,7 @@
+ 				AdditionalDependencies="ws2_32.lib"
+ 				IgnoreDefaultLibraryNames="libc"
+ 				BaseAddress="0x1D110000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -244,6 +247,7 @@
+ 				AdditionalDependencies="ws2_32.lib"
+ 				IgnoreDefaultLibraryNames="libc"
+ 				BaseAddress="0x1D110000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -306,6 +310,7 @@
+ 				AdditionalDependencies="ws2_32.lib"
+ 				IgnoreDefaultLibraryNames="libc"
+ 				BaseAddress="0x1D110000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -370,6 +375,7 @@
+ 				IgnoreDefaultLibraryNames="libc"
+ 				BaseAddress="0x1D110000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -432,6 +438,7 @@
+ 				AdditionalDependencies="ws2_32.lib"
+ 				IgnoreDefaultLibraryNames="libc"
+ 				BaseAddress="0x1D110000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -496,6 +503,7 @@
+ 				IgnoreDefaultLibraryNames="libc"
+ 				BaseAddress="0x1D110000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.4/PCbuild/sqlite3.vcproj misc/build/Python-2.7.4/PCbuild/sqlite3.vcproj
+--- misc/Python-2.7.4/PCbuild/sqlite3.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/sqlite3.vcproj	2012-07-30 20:59:37.000000000 -0500
+@@ -56,6 +56,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				OutputFile="$(OutDir)\$(ProjectName)_d.dll"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -117,6 +118,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				OutputFile="$(OutDir)\$(ProjectName)_d.dll"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -178,6 +180,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				OutputFile="$(OutDir)\$(ProjectName).dll"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -240,6 +243,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				OutputFile="$(OutDir)\$(ProjectName).dll"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -301,6 +305,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				OutputFile="$(OutDir)\$(ProjectName).dll"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -362,6 +367,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -423,6 +429,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				OutputFile="$(OutDir)\$(ProjectName).dll"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -484,6 +491,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.4/PCbuild/unicodedata.vcproj misc/build/Python-2.7.4/PCbuild/unicodedata.vcproj
+--- misc/Python-2.7.4/PCbuild/unicodedata.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/unicodedata.vcproj	2012-07-30 20:59:37.000000000 -0500
+@@ -55,6 +55,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D120000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -115,6 +116,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D120000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -175,6 +177,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D120000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -236,6 +239,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D120000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -296,6 +300,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D120000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -358,6 +363,7 @@
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D120000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -418,6 +424,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D120000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -480,6 +487,7 @@
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D120000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.4/PCbuild/w9xpopen.vcproj misc/build/Python-2.7.4/PCbuild/w9xpopen.vcproj
+--- misc/Python-2.7.4/PCbuild/w9xpopen.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/w9xpopen.vcproj	2012-07-30 20:59:37.000000000 -0500
+@@ -59,6 +59,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				SubSystem="1"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -124,6 +125,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				SubSystem="1"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -191,6 +193,7 @@
+ 				Name="VCLinkerTool"
+ 				GenerateDebugInformation="false"
+ 				SubSystem="1"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -259,6 +262,7 @@
+ 				Name="VCLinkerTool"
+ 				GenerateDebugInformation="false"
+ 				SubSystem="1"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -327,6 +331,7 @@
+ 				GenerateDebugInformation="false"
+ 				SubSystem="1"
+ 				ImportLibrary=""
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -397,6 +402,7 @@
+ 				SubSystem="1"
+ 				ImportLibrary=""
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -465,6 +471,7 @@
+ 				GenerateDebugInformation="false"
+ 				SubSystem="1"
+ 				ImportLibrary=""
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -535,6 +542,7 @@
+ 				SubSystem="1"
+ 				ImportLibrary=""
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.4/PCbuild/winsound.vcproj misc/build/Python-2.7.4/PCbuild/winsound.vcproj
+--- misc/Python-2.7.4/PCbuild/winsound.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/winsound.vcproj	2012-07-30 20:59:37.000000000 -0500
+@@ -55,6 +55,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="winmm.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -115,6 +116,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="winmm.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -175,6 +177,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="winmm.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -236,6 +239,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="winmm.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -296,6 +300,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="winmm.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -358,6 +363,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="winmm.lib"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -418,6 +424,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="winmm.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -480,6 +487,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="winmm.lib"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"

Added: openoffice/trunk/main/python/python-2.7.4-sysbase.patch
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-2.7.4-sysbase.patch?rev=1478650&view=auto
==============================================================================
--- openoffice/trunk/main/python/python-2.7.4-sysbase.patch (added)
+++ openoffice/trunk/main/python/python-2.7.4-sysbase.patch Fri May  3 05:53:32 2013
@@ -0,0 +1,13 @@
+--- misc/Python-2.7.4/configure	2012-04-09 18:07:36.000000000 -0500
++++ misc/build/Python-2.7.4/configure	2012-07-22 15:01:20.000000000 -0500
+@@ -2982,7 +2982,9 @@
+ if test -z "$MACHDEP"
+ then
+ 	ac_sys_system=`uname -s`
+-	if test "$ac_sys_system" = "AIX" \
++	if test -n "$OOO_SYSBASE_SYS_RELEASE"; then
++		ac_sys_release=$OOO_SYSBASE_SYS_RELEASE
++	elif test "$ac_sys_system" = "AIX" \
+ 	-o "$ac_sys_system" = "UnixWare" -o "$ac_sys_system" = "OpenUNIX"; then
+ 		ac_sys_release=`uname -v`
+ 	else

Modified: openoffice/trunk/main/python/python-freebsd.patch
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-freebsd.patch?rev=1478650&r1=1478649&r2=1478650&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-freebsd.patch (original)
+++ openoffice/trunk/main/python/python-freebsd.patch Fri May  3 05:53:32 2013
@@ -1,5 +1,5 @@
---- 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
+--- misc/Python-2.7.4/Lib/plat-freebsd9/IN.py	1969-12-31 19:00:00.000000000 -0500
++++ misc/build/Python-2.7.4/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
 +
@@ -613,14 +613,14 @@
 +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
+--- misc/Python-2.7.4/Lib/plat-freebsd9/regen	1969-12-31 19:00:00.000000000 -0500
++++ misc/build/Python-2.7.4/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-08-01 18:44:40.000000000 -0500
+--- misc/Python-2.7.4/Lib/test/test_threading.py	2012-04-09 18:07:32.000000000 -0500
++++ misc/build/Python-2.7.4/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
@@ -630,8 +630,8 @@
                           'os2emx')
  
      def _run_and_join(self, script):
---- 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-08-01 18:53:21.000000000 -0500
+--- misc/Python-2.7.4/Modules/_ctypes/libffi/configure	2012-04-09 18:07:33.000000000 -0500
++++ misc/build/Python-2.7.4/Modules/_ctypes/libffi/configure	2012-08-01 18:53:21.000000000 -0500
 @@ -6289,7 +6289,7 @@
    rm -rf conftest*
    ;;
@@ -651,8 +651,8 @@
    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
+--- misc/Python-2.7.4/Modules/fcntlmodule.c	2012-04-09 18:07:34.000000000 -0500
++++ misc/build/Python-2.7.4/Modules/fcntlmodule.c	2012-08-01 18:44:40.000000000 -0500
 @@ -97,20 +97,15 @@
  {
  #define IOCTL_BUFSZ 1024
@@ -704,8 +704,8 @@
           " 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-08-01 18:44:40.000000000 -0500
+--- misc/Python-2.7.4/Python/thread_pthread.h	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/Python/thread_pthread.h	2012-08-01 18:44:40.000000000 -0500
 @@ -38,13 +38,18 @@
  #endif
  #endif
@@ -759,9 +759,9 @@
  #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
      pthread_attr_destroy(&attrs);
  #endif
-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-08-01 18:44:40.000000000 -0500
+diff -ruN misc/Python-2.7.4/configure misc/build/Python-2.7.4/configure
+--- misc/Python-2.7.4/configure	2012-04-09 18:07:36.000000000 -0500
++++ misc/build/Python-2.7.4/configure	2012-08-01 18:44:40.000000000 -0500
 @@ -4916,7 +4916,7 @@
            ;;
      SunOS*)
@@ -783,24 +783,24 @@ diff -ruN misc/Python-2.7.3/configure mi
  	  INSTSONAME="$LDLIBRARY".$SOVERSION
  	  ;;
      hp*|HP*)
-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-08-01 18:44:40.000000000 -0500
-@@ -1432,7 +1432,7 @@
+diff -ruN misc/Python-2.7.4/setup.py misc/build/Python-2.7.4/setup.py
+--- misc/Python-2.7.4/setup.py	2012-04-09 18:07:36.000000000 -0500
++++ misc/build/Python-2.7.4/setup.py	2012-08-01 18:44:40.000000000 -0500
+@@ -1555,7 +1540,7 @@
              macros = dict()
              libraries = []
  
--        elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
-+        elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9'):
+-        elif host_platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
++        elif host_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()
-@@ -1484,7 +1484,7 @@
+@@ -1607,7 +1592,7 @@
              missing.append('linuxaudiodev')
  
-         if (platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
+         if (host_platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
 -                        'freebsd7', 'freebsd8')
 +                        'freebsd7', 'freebsd8', 'freebsd9')
-             or platform.startswith("gnukfreebsd")):
+             or host_platform.startswith("gnukfreebsd")):
              exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
          else:

Modified: openoffice/trunk/main/python/python-md5.patch
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-md5.patch?rev=1478650&r1=1478649&r2=1478650&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-md5.patch (original)
+++ openoffice/trunk/main/python/python-md5.patch Fri May  3 05:53:32 2013
@@ -1,6 +1,6 @@
-diff -ru misc/Python-2.7.3/Modules/Setup.dist misc/build/Python-2.7.3/Modules/Setup.dist
---- misc/Python-2.7.3/Modules/Setup.dist	2012-04-09 18:07:33.000000000 -0500
-+++ misc/build/Python-2.7.3/Modules/Setup.dist	2012-07-24 17:08:56.000000000 -0500
+diff -ru misc/Python-2.7.4/Modules/Setup.dist misc/build/Python-2.7.4/Modules/Setup.dist
+--- misc/Python-2.7.4/Modules/Setup.dist	2012-04-09 18:07:33.000000000 -0500
++++ misc/build/Python-2.7.4/Modules/Setup.dist	2012-07-24 17:08:56.000000000 -0500
 @@ -248,14 +248,14 @@
  # Message-Digest Algorithm, described in RFC 1321.  The necessary files
  # md5.c and md5.h are included here.

Modified: openoffice/trunk/main/python/python-solaris.patch
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-solaris.patch?rev=1478650&r1=1478649&r2=1478650&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-solaris.patch (original)
+++ openoffice/trunk/main/python/python-solaris.patch Fri May  3 05:53:32 2013
@@ -1,5 +1,5 @@
---- misc/Python-2.7.3/Include/pyport.h	2012-04-09 18:07:29.000000000 -0500
-+++ misc/build/Python-2.7.3/Include/pyport.h	2012-07-24 18:19:52.000000000 -0500
+--- misc/Python-2.7.4/Include/pyport.h	2012-04-09 18:07:29.000000000 -0500
++++ misc/build/Python-2.7.4/Include/pyport.h	2012-07-24 18:19:52.000000000 -0500
 @@ -603,11 +603,6 @@
  in platform-specific #ifdefs.
  **************************************************************************/

Modified: openoffice/trunk/main/python/python-ssl.patch
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-ssl.patch?rev=1478650&r1=1478649&r2=1478650&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-ssl.patch (original)
+++ openoffice/trunk/main/python/python-ssl.patch Fri May  3 05:53:32 2013
@@ -1,15 +1,15 @@
-diff -ru misc/Python-2.7.3/PCbuild/build_ssl.py misc/build/Python-2.7.3/PCbuild/build_ssl.py
---- misc/Python-2.7.3/PCbuild/build_ssl.py	2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/build_ssl.py	2012-07-25 14:37:37.000000000 -0500
+diff -ru misc/Python-2.7.4/PCbuild/build_ssl.py misc/build/Python-2.7.4/PCbuild/build_ssl.py
+--- misc/Python-2.7.4/PCbuild/build_ssl.py	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/build_ssl.py	2012-07-25 14:37:37.000000000 -0500
 @@ -253,4 +253,4 @@
      sys.exit(rc)
  
  if __name__=='__main__':
 -    main()
 +    sys.exit(0)
-diff -ru 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-25 14:37:37.000000000 -0500
+diff -ru misc/Python-2.7.4/setup.py misc/build/Python-2.7.4/setup.py
+--- misc/Python-2.7.4/setup.py	2012-04-09 18:07:36.000000000 -0500
++++ misc/build/Python-2.7.4/setup.py	2012-07-25 14:37:37.000000000 -0500
 @@ -702,7 +702,15 @@
          exts.append( Extension('_socket', ['socketmodule.c'],
                                 depends = ['socketmodule.h']) )

Modified: openoffice/trunk/main/python/pyversion.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/python/pyversion.mk?rev=1478650&r1=1478649&r2=1478650&view=diff
==============================================================================
--- openoffice/trunk/main/python/pyversion.mk (original)
+++ openoffice/trunk/main/python/pyversion.mk Fri May  3 05:53:32 2013
@@ -22,7 +22,7 @@
 # in the python project accordingly !!!
 PYMAJOR=2
 PYMINOR=7
-PYMICRO=3
+PYMICRO=4
 PYVERSION=$(PYMAJOR).$(PYMINOR).$(PYMICRO)
 
 .IF "$(GUI)" == "UNX"



Mime
View raw message