From 97ad46b3758f465f7eef17cf63572c7fb723cff6 Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Fri, 9 Jan 2015 13:29:54 -0800 Subject: Issue #23212: Update OS X installer build OpenSSL to 1.0.1k. (currently only used for builds with <= 10.5 deployment targets) --- Mac/BuildScript/build-installer.py | 6 +++--- Mac/BuildScript/openssl_sdk_makedepend.patch | 16 +++++++++------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index d0c91ec..379cb95 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -237,9 +237,9 @@ def library_recipes(): result.extend([ dict( - name="OpenSSL 1.0.1j", - url="https://www.openssl.org/source/openssl-1.0.1j.tar.gz", - checksum='f7175c9cd3c39bb1907ac8bba9df8ed3', + name="OpenSSL 1.0.1k", + url="https://www.openssl.org/source/openssl-1.0.1k.tar.gz", + checksum='d4f002bd22a56881340105028842ae1f', patches=[ "openssl_sdk_makedepend.patch", ], diff --git a/Mac/BuildScript/openssl_sdk_makedepend.patch b/Mac/BuildScript/openssl_sdk_makedepend.patch index 6f95487..a72f5a3 100644 --- a/Mac/BuildScript/openssl_sdk_makedepend.patch +++ b/Mac/BuildScript/openssl_sdk_makedepend.patch @@ -1,13 +1,15 @@ # openssl_sdk_makedepend.patch # -# using openssl 1.0.1j +# using openssl 1.0.1k # # - support building with an OS X SDK # - allow "make depend" to use compilers with names other than "gcc" diff Configure ---- a/Configure Fri Dec 05 01:24:16 2014 -0800 -+++ b/Configure Fri Dec 05 01:52:29 2014 -0800 + +diff -r 99ae439a07f1 Configure +--- a/Configure Fri Jan 09 12:50:43 2015 -0800 ++++ b/Configure Fri Jan 09 12:53:52 2015 -0800 @@ -577,11 +577,11 @@ ##### MacOS X (a.k.a. Rhapsody or Darwin) setup @@ -25,7 +27,7 @@ diff Configure "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", -@@ -1624,7 +1624,7 @@ +@@ -1629,7 +1629,7 @@ s/^CC=.*$/CC= $cc/; s/^AR=\s*ar/AR= $ar/; s/^RANLIB=.*/RANLIB= $ranlib/; @@ -34,9 +36,9 @@ diff Configure } s/^CFLAG=.*$/CFLAG= $cflags/; s/^DEPFLAG=.*$/DEPFLAG=$depflags/; -diff util/domd ---- a/util/domd Fri Dec 05 01:24:16 2014 -0800 -+++ b/util/domd Fri Dec 05 01:52:29 2014 -0800 +diff -r 99ae439a07f1 util/domd +--- a/util/domd Fri Jan 09 12:50:43 2015 -0800 ++++ b/util/domd Fri Jan 09 12:53:52 2015 -0800 @@ -14,7 +14,7 @@ cp Makefile Makefile.save # fake the presence of Kerberos -- cgit v0.12 From 54362ca1da1f4d9b2e1edb78abaea54af0cfaa2c Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Fri, 9 Jan 2015 13:30:11 -0800 Subject: Issue #23212: 3.4-specific OS X installer updates --- Mac/BuildScript/README.txt | 46 ++---------------------------------- Mac/BuildScript/resources/ReadMe.rtf | 2 +- 2 files changed, 3 insertions(+), 45 deletions(-) diff --git a/Mac/BuildScript/README.txt b/Mac/BuildScript/README.txt index 66d9935..8eb539c 100644 --- a/Mac/BuildScript/README.txt +++ b/Mac/BuildScript/README.txt @@ -21,9 +21,6 @@ transforming the output build artifacts into signed flat packages is not yet integrated into ``build-installer.py``. The steps prior to the flat package creation are the same as for 3.4.1 below. -For Python 3.4.0 and 3.4.1, PSF practice was to build two installer variants -for each release. - 1. 32-bit-only, i386 and PPC universal, capable on running on all machines supported by Mac OS X 10.5 through (at least) 10.9:: @@ -34,6 +31,7 @@ for each release. - builds the following third-party libraries + * libcrypto and libssl from OpenSSL 1.0.1 (new, as of 3.4.3) * NCurses 5.9 (http://bugs.python.org/issue15037) * SQLite 3.8.3.1 * XZ 5.0.5 @@ -75,6 +73,7 @@ for each release. - uses system-supplied versions of third-party libraries + * libcrypto and libssl from Apple OpenSSL 0.9.8 * readline module links with Apple BSD editline (libedit) - requires ActiveState Tcl/Tk 8.5.15.1 (or later) to be installed for building @@ -103,47 +102,6 @@ for each release. that the Xcode 3 gcc-4.2 compiler has had. -* For Python 2.7.x and 3.2.x, the 32-bit-only installer was configured to - support Mac OS X 10.3.9 through (at least) 10.6. Because it is - believed that there are few systems still running OS X 10.3 or 10.4 - and because it has become increasingly difficult to test and - support the differences in these earlier systems, as of Python 3.3.0 the PSF - 32-bit installer no longer supports them. For reference in building such - an installer yourself, the details are:: - - /usr/bin/python build-installer.py \ - --sdk-path=/Developer/SDKs/MacOSX10.4u.sdk \ - --universal-archs=32-bit \ - --dep-target=10.3 - - - builds the following third-party libraries - - * Bzip2 - * NCurses - * GNU Readline (GPL) - * SQLite 3 - * XZ - * Zlib 1.2.3 - * Oracle Sleepycat DB 4.8 (Python 2.x only) - - - requires ActiveState ``Tcl/Tk 8.4`` (currently 8.4.20) to be installed for building - - - recommended build environment: - - * Mac OS X 10.5.8 PPC or Intel - * Xcode 3.1.4 (or later) - * ``MacOSX10.4u`` SDK (later SDKs do not support PPC G3 processors) - * ``MACOSX_DEPLOYMENT_TARGET=10.3`` - * Apple ``gcc-4.0`` - * system Python 2.5 for documentation build with Sphinx - - - alternate build environments: - - * Mac OS X 10.6.8 with Xcode 3.2.6 - - need to change ``/System/Library/Frameworks/{Tcl,Tk}.framework/Version/Current`` to ``8.4`` - - - General Prerequisites --------------------- diff --git a/Mac/BuildScript/resources/ReadMe.rtf b/Mac/BuildScript/resources/ReadMe.rtf index 1e0ade9..1bbdc1a 100644 --- a/Mac/BuildScript/resources/ReadMe.rtf +++ b/Mac/BuildScript/resources/ReadMe.rtf @@ -125,7 +125,7 @@ For OS X 10.5, Apple provides \i0 . To solve this problem, as of 3.4.3 the \i 10.5+ 32-bit-only python.org variant \i0 is linked with a private copy of -\i OpenSSL 1.0.1j +\i OpenSSL 1.0.1 \i0 ; it consults the same default certificate directory, \f1 /System/Library/OpenSSL \f0 . As before, it is still necessary to manage certificates yourself when you use this Python variant and, with certificate verification now enabled by default, you may now need to take additional steps to ensure your Python programs have access to CA certificates you trust. If you use this Python variant to build standalone applications with third-party tools like {\field{\*\fldinst{HYPERLINK "https://pypi.python.org/pypi/py2app/"}}{\fldrslt -- cgit v0.12