From a5b5d807975b64e582f02974cd702a38b1a21fe6 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Tue, 15 Apr 2014 17:51:36 -0700 Subject: [PATCH] client: Update to OpenSSL 1.0.1g on Macitosh --- mac_build/HowToBuildBOINC_XCode.rtf | 16 ++++++++-------- mac_build/boinc.xcodeproj/project.pbxproj | 8 ++++---- mac_build/buildopenssl.sh | 15 +++++++++------ 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/mac_build/HowToBuildBOINC_XCode.rtf b/mac_build/HowToBuildBOINC_XCode.rtf index cd07a0e58f..2e89ef5be9 100644 --- a/mac_build/HowToBuildBOINC_XCode.rtf +++ b/mac_build/HowToBuildBOINC_XCode.rtf @@ -14,10 +14,10 @@ \b0\fs24 \cf0 \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc \cf0 Written by Charlie Fenton\ -Last updated 4/19/13\ +Last updated 4/15/14\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640 \cf0 \ -This document applies to BOINC version 7.0.42 and later. It has instructions for building the BOINC Client and Manager for Macintosh OSX. Information for building science project applications to run under BOINC on Macintosh OSX can be found {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/trac/wiki/BuildMacApp"}}{\fldrslt here}}. \ +This document applies to BOINC version 7.0.81 and later. It has instructions for building the BOINC Client and Manager for Macintosh OSX. Information for building science project applications to run under BOINC on Macintosh OSX can be found {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/trac/wiki/BuildMacApp"}}{\fldrslt here}}. \ \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640 @@ -99,7 +99,7 @@ You get these tools, including the GCC compilers and system library header files \b0\fs24 \cf0 \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural -\cf0 BOINC depends on six third-party libraries: wxMac-2.8.10, c-ares-1.9.1, curl-7.26.0, openssl-1.0.1c, freetype-2.4.10, ftgl-2.1.3~rc5 and sqlite3.7.14.1. You can obtain the source files from the following URLs:\ +\cf0 BOINC depends on six third-party libraries: wxMac-2.8.10, c-ares-1.9.1, curl-7.26.0, openssl-1.0.1g, freetype-2.4.10, ftgl-2.1.3~rc5 and sqlite3.7.14.1. You can obtain the source files from the following URLs:\ \ wxMac-2.8.10 (needed only if you are building the BOINC Manager):\ {\field{\*\fldinst{HYPERLINK "http://www.wxwidgets.org"}}{\fldrslt @@ -140,11 +140,11 @@ curl-7.26.0:\ \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural -\f0\fs24 \cf0 openssl-1.0.1c:\ +\f0\fs24 \cf0 openssl-1.0.1g:\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural \f1\fs26 \cf0 {\field{\*\fldinst{HYPERLINK "http://www.openssl.org/"}}{\fldrslt http://www.openssl.org/}}\ - {\field{\*\fldinst{HYPERLINK "http://www.openssl.org/source/openssl-1.0.1c.tar.gz"}}{\fldrslt http://www.openssl.org/source/openssl-1.0.1c.tar.gz}}\ + {\field{\*\fldinst{HYPERLINK "http://www.openssl.org/source/openssl-1.0.1g.tar.gz"}}{\fldrslt http://www.openssl.org/source/openssl-1.0.1g.tar.gz}}\ \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural @@ -180,7 +180,7 @@ MAC_OS_X_VERSION_MIN_REQUIRED=1040\ \f0\fs24 \cf0 \ \pard\pardeftab720\sa260 -\cf0 These are not done automatically by either the Xcode projects which come with wxMac-2.8.10, nor the AutoMake scripts supplied with wxMac-2.8.10, c-ares-1.9.1, curl-7.26.0, openssl-1.0.1c, freetype-2.4.10, ftgl-2.1.3~rc5 and sqlite3.7.14.1. So be sure to use our special scripts to build these packages.\ +\cf0 These are not done automatically by either the Xcode projects which come with wxMac-2.8.10, nor the AutoMake scripts supplied with wxMac-2.8.10, c-ares-1.9.1, curl-7.26.0, openssl-1.0.1g, freetype-2.4.10, ftgl-2.1.3~rc5 and sqlite3.7.14.1. So be sure to use our special scripts to build these packages.\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640 \cf0 [1] Create a parent directory within which to work. In this description , we will call it BOINC_dev, but you can name it anything you wish.\ \ @@ -192,7 +192,7 @@ MAC_OS_X_VERSION_MIN_REQUIRED=1040\ \f1\fs26 \ curl-7.26.0\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural -\cf0 openssl-1.0.1c\ +\cf0 openssl-1.0.1g\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640 \cf0 wxMac-2.8.10\ freetype-2.4.10\ @@ -253,7 +253,7 @@ If you don't wish to force a full rebuild of everything, omit the -clean argumen \f0\fs24 command to run them.\ \b Note 2: -\b0 this script tries to build all six third-party libraries: wxMac-2.8.10, c-ares-1.9.1, curl-7.26.0, openssl-1.0.1c, freetype-2.4.10, ftgl-2.1.3~rc5 and sqlite3.7.14.1. when the script finishes, it will display a warning about any libraries was unable to build (for example, if you have not downloaded them.)\ +\b0 this script tries to build all six third-party libraries: wxMac-2.8.10, c-ares-1.9.1, curl-7.26.0, openssl-1.0.1g, freetype-2.4.10, ftgl-2.1.3~rc5 and sqlite3.7.14.1. when the script finishes, it will display a warning about any libraries was unable to build (for example, if you have not downloaded them.)\ \ [5] Build BOINC as follows:\ \ diff --git a/mac_build/boinc.xcodeproj/project.pbxproj b/mac_build/boinc.xcodeproj/project.pbxproj index 6964304e9e..6435538191 100755 --- a/mac_build/boinc.xcodeproj/project.pbxproj +++ b/mac_build/boinc.xcodeproj/project.pbxproj @@ -3977,8 +3977,8 @@ "-L.", "../../curl-7.26.0/lib/.libs/libcurl.a", "../../c-ares-1.9.1/.libs/libcares.a", - "../../openssl-1.0.1c/libcrypto.a", - "../../openssl-1.0.1c/libssl.a", + "../../openssl-1.0.1g/libcrypto.a", + "../../openssl-1.0.1g/libssl.a", "-lldap", "-lz", ); @@ -4160,8 +4160,8 @@ "-L.", "../../curl-7.26.0/lib/.libs/libcurl.a", "../../c-ares-1.9.1/.libs/libcares.a", - "../../openssl-1.0.1c/libcrypto.a", - "../../openssl-1.0.1c/libssl.a", + "../../openssl-1.0.1g/libcrypto.a", + "../../openssl-1.0.1g/libssl.a", "-lldap", "-lz", ); diff --git a/mac_build/buildopenssl.sh b/mac_build/buildopenssl.sh index 2c819efc39..f254dbdfc3 100644 --- a/mac_build/buildopenssl.sh +++ b/mac_build/buildopenssl.sh @@ -2,7 +2,7 @@ # This file is part of BOINC. # http://boinc.berkeley.edu -# Copyright (C) 2008 University of California +# Copyright (C) 2014 University of California # # BOINC is free software; you can redistribute it and/or modify it # under the terms of the GNU Lesser General Public License @@ -18,11 +18,14 @@ # along with BOINC. If not, see . # # -# Script to build Macintosh 32-bit Intel openssl-1.0.1c libraries +# Script to build Macintosh 32-bit Intel openssl-1.0.1e libraries # libcrypto.a and libssl.a for use in building BOINC. # # by Charlie Fenton 6/25/12 # Updated 7/10/12 for Xcode 4.3 and later which are not at a fixed address +# Updated 7/30/13 for openssl-1.0.1e +# Updated 2/12/14 for openssl-1.0.1f +# Updated 4/14/14 for openssl-1.0.1g # ## This script requires OS 10.6 or later # @@ -30,8 +33,8 @@ ## and clicked the Install button on the dialog which appears to ## complete the Xcode installation before running this script. # -## In Terminal, CD to the openssl-1.0.1c directory. -## cd [path]/openssl-1.0.1c/ +## In Terminal, CD to the openssl-1.0.1g directory. +## cd [path]/openssl-1.0.1g/ ## then run this script: ## source [path]/buildopenssl.sh [ -clean ] ## @@ -40,7 +43,7 @@ if [ "$1" != "-clean" ]; then if [ -f libssl.a ]&& [ -f libcrypto.a ]; then - echo "openssl-1.0.1c libraries already built" + echo "openssl-1.0.1g libraries already built" return 0 fi fi @@ -99,7 +102,7 @@ if [ "$1" = "-clean" ]; then make clean fi -make +make build_crypto build_ssl build_engines if [ $? -ne 0 ]; then return 1; fi export CC="";export CXX=""