summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorAriel Constenla-Haile <arielch@apache.org>2012-07-19 23:35:43 +0000
committerAriel Constenla-Haile <arielch@apache.org>2012-07-19 23:35:43 +0000
commit69aa1c5c3e7b1d7af8289c79fb50dcafc0ef1348 (patch)
tree7558e9fb55dbae02210b0ec380cbc2c23ebdc223 /python
parent8c5cd0cbad918949f898d7fccb4f1a00a8a9f5f5 (diff)
Fix build breaker: malformed Python patch
Notes
Notes: prefer: 8a6c5b2fcbf2b6d87529e91f58aa41c02d0fc990
Diffstat (limited to 'python')
-rw-r--r--python/Python-2.6.1-security-flags.patch4
1 files changed, 1 insertions, 3 deletions
diff --git a/python/Python-2.6.1-security-flags.patch b/python/Python-2.6.1-security-flags.patch
index c22613091ae0..5916a9c00d24 100644
--- a/python/Python-2.6.1-security-flags.patch
+++ b/python/Python-2.6.1-security-flags.patch
@@ -539,12 +539,10 @@
Name="VCALinkTool"
--- misc/Python-2.6.1/PCbuild/_ssl.vcproj 2012-07-17 13:58:39.048409000 +0200
+++ misc/build/Python-2.6.1/PCbuild/_ssl.vcproj 2012-07-17 13:57:52.319736300 +0200
-@@ -57,8 +57,7 @@
+@@ -57,6 +57,7 @@
/>
<Tool
Name="VCLinkerTool"
-- RandomizedBaseAddress="1"
-- DataExecutionPrevention="1"
+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
/>