Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity
cpython/Mac/BuildScript/openssl_sdk_makedepend.patch

55 lines
5.4 KiB
Diff
Raw Normal View History

Issue #23594: Update OS X 10.5 installer build to use OpenSSL 1.0.2.
2015-03-05 21:34:24 -04:00
# HG changeset patch
Issue #23686: Update OS X 10.5 installer build to use OpenSSL 1.0.2a.
2015-03-19 20:21:10 -03:00
# Parent 25a9af415e8c3faf591c360d5f0e361d049b2b43
Issue #17128: Use private version of OpenSSL for 3.x OS X 10.5+ installers. Among other issues, the Apple-supplied 0.9.7 libs for the 10.5 ABI cannot verify newer SHA-256 certs as now used by python.org services. Document in the installer ReadMe some of the certificate management issues that users now need to be more concerned with due to PEP 476's enabling cert verification by default. For now, continue to use the Apple-supplied 0.9.8 libs for the 10.6+ installer since they use Apple private APIs to verify certificates using the system- and user-managed CA keychain stores.
2014-12-13 04:17:46 -04:00
# openssl_sdk_makedepend.patch
#
Issue #23686: Update OS X 10.5 installer build to use OpenSSL 1.0.2a.
2015-03-19 20:21:10 -03:00
# using openssl 1.0.2a
Issue #17128: Use private version of OpenSSL for 3.x OS X 10.5+ installers. Among other issues, the Apple-supplied 0.9.7 libs for the 10.5 ABI cannot verify newer SHA-256 certs as now used by python.org services. Document in the installer ReadMe some of the certificate management issues that users now need to be more concerned with due to PEP 476's enabling cert verification by default. For now, continue to use the Apple-supplied 0.9.8 libs for the 10.6+ installer since they use Apple private APIs to verify certificates using the system- and user-managed CA keychain stores.
2014-12-13 04:17:46 -04:00
#
# - support building with an OS X SDK
# - allow "make depend" to use compilers with names other than "gcc"
diff Configure
Issue #23212: Update OS X installer build OpenSSL to 1.0.1k. (currently only used for builds with <= 10.5 deployment targets)
2015-01-09 17:29:54 -04:00
Issue #23686: Update OS X 10.5 installer build to use OpenSSL 1.0.2a.
2015-03-19 20:21:10 -03:00
diff --git a/Configure b/Configure
--- a/Configure
+++ b/Configure
Issue #23594: Update OS X 10.5 installer build to use OpenSSL 1.0.2.
2015-03-05 21:34:24 -04:00
@@ -617,12 +617,12 @@
Issue #17128: Use private version of OpenSSL for 3.x OS X 10.5+ installers. Among other issues, the Apple-supplied 0.9.7 libs for the 10.5 ABI cannot verify newer SHA-256 certs as now used by python.org services. Document in the installer ReadMe some of the certificate management issues that users now need to be more concerned with due to PEP 476's enabling cert verification by default. For now, continue to use the Apple-supplied 0.9.8 libs for the 10.6+ installer since they use Apple private APIs to verify certificates using the system- and user-managed CA keychain stores.
2014-12-13 04:17:46 -04:00
##### MacOS X (a.k.a. Rhapsody or Darwin) setup
"rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::",
-"darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN -Wa,-force_cpusubtype_ALL::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-"darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc64_asm}:osx64:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-"darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:".eval{my $asm=$x86_asm;$asm=~s/cast\-586\.o//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-"debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
Issue #23594: Update OS X 10.5 installer build to use OpenSSL 1.0.2.
2015-03-05 21:34:24 -04:00
-"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-"debug-darwin64-x86_64-cc","cc:-arch x86_64 -ggdb -g2 -O0 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
Issue #17128: Use private version of OpenSSL for 3.x OS X 10.5+ installers. Among other issues, the Apple-supplied 0.9.7 libs for the 10.5 ABI cannot verify newer SHA-256 certs as now used by python.org services. Document in the installer ReadMe some of the certificate management issues that users now need to be more concerned with due to PEP 476's enabling cert verification by default. For now, continue to use the Apple-supplied 0.9.8 libs for the 10.6+ installer since they use Apple private APIs to verify certificates using the system- and user-managed CA keychain stores.
2014-12-13 04:17:46 -04:00
+"darwin-ppc-cc","cc:-arch ppc -isysroot \$(OSX_SDK) -O3 -DB_ENDIAN -Wa,-force_cpusubtype_ALL::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+"darwin64-ppc-cc","cc:-arch ppc64 -isysroot \$(OSX_SDK) -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc64_asm}:osx64:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+"darwin-i386-cc","cc:-arch i386 -isysroot \$(OSX_SDK) -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:".eval{my $asm=$x86_asm;$asm=~s/cast\-586\.o//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+"debug-darwin-i386-cc","cc:-arch i386 -isysroot \$(OSX_SDK) -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
Issue #23594: Update OS X 10.5 installer build to use OpenSSL 1.0.2.
2015-03-05 21:34:24 -04:00
+"darwin64-x86_64-cc","cc:-arch x86_64 -isysroot \$(OSX_SDK) -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+"debug-darwin64-x86_64-cc","cc:-arch x86_64 -isysroot \$(OSX_SDK) -ggdb -g2 -O0 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
Issue #17128: Use private version of OpenSSL for 3.x OS X 10.5+ installers. Among other issues, the Apple-supplied 0.9.7 libs for the 10.5 ABI cannot verify newer SHA-256 certs as now used by python.org services. Document in the installer ReadMe some of the certificate management issues that users now need to be more concerned with due to PEP 476's enabling cert verification by default. For now, continue to use the Apple-supplied 0.9.8 libs for the 10.6+ installer since they use Apple private APIs to verify certificates using the system- and user-managed CA keychain stores.
2014-12-13 04:17:46 -04:00
"debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
# iPhoneOS/iOS
"iphoneos-cross","llvm-gcc:-O3 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fomit-frame-pointer -fno-common::-D_REENTRANT:iOS:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
Issue #23594: Update OS X 10.5 installer build to use OpenSSL 1.0.2.
2015-03-05 21:34:24 -04:00
@@ -1685,7 +1685,7 @@
Issue #17128: Use private version of OpenSSL for 3.x OS X 10.5+ installers. Among other issues, the Apple-supplied 0.9.7 libs for the 10.5 ABI cannot verify newer SHA-256 certs as now used by python.org services. Document in the installer ReadMe some of the certificate management issues that users now need to be more concerned with due to PEP 476's enabling cert verification by default. For now, continue to use the Apple-supplied 0.9.8 libs for the 10.6+ installer since they use Apple private APIs to verify certificates using the system- and user-managed CA keychain stores.
2014-12-13 04:17:46 -04:00
s/^CC=.*$/CC= $cc/;
s/^AR=\s*ar/AR= $ar/;
s/^RANLIB=.*/RANLIB= $ranlib/;
- s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc";
+ s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/;
}
s/^CFLAG=.*$/CFLAG= $cflags/;
s/^DEPFLAG=.*$/DEPFLAG=$depflags/;
Issue #23686: Update OS X 10.5 installer build to use OpenSSL 1.0.2a.
2015-03-19 20:21:10 -03:00
diff --git a/util/domd b/util/domd
--- a/util/domd
+++ b/util/domd
Issue #17128: Use private version of OpenSSL for 3.x OS X 10.5+ installers. Among other issues, the Apple-supplied 0.9.7 libs for the 10.5 ABI cannot verify newer SHA-256 certs as now used by python.org services. Document in the installer ReadMe some of the certificate management issues that users now need to be more concerned with due to PEP 476's enabling cert verification by default. For now, continue to use the Apple-supplied 0.9.8 libs for the 10.6+ installer since they use Apple private APIs to verify certificates using the system- and user-managed CA keychain stores.
2014-12-13 04:17:46 -04:00
@@ -14,7 +14,7 @@
cp Makefile Makefile.save
# fake the presence of Kerberos
touch $TOP/krb5.h
-if expr "$MAKEDEPEND" : '.*gcc$' > /dev/null; then
+if true ; then # was: if expr "$MAKEDEPEND" : '.*gcc$' > /dev/null; then
args=""
while [ $# -gt 0 ]; do
if [ "$1" != "--" ]; then args="$args $1"; fi