Mac: Update libCurl to 7.19.4

svn path=/trunk/boinc/; revision=17440
2009-03-03 09:07:02 +00:00 · 2009-03-03 09:07:02 +00:00 · 733551a143
parent abcb5fe06c
commit 733551a143
5 changed files with 43 additions and 35 deletions
--- a/10
+++ b/10
@ -2514,3 +2514,13 @@ Charlie 2 Mar 2009
        hostinfo_unix.cpp
    lib/
        hostinfo.h
+
+Charlie 3 Mar 2009
+    - Mac: Update libCurl to 7.19.4.
+
+    mac_build/
+        buildcurl.sh
+        HowToBuildBOINC_XCode.rtf
+        setupForBOINC.sh
+        boinc.xcodeproj/
+            project.pbxproj
--- a/mac_build/HowToBuildBOINC_XCode.rtf
+++ b/mac_build/HowToBuildBOINC_XCode.rtf
@ -1,4 +1,4 @@
-{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf350
+{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf430
 {\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 Courier;\f2\fnil\fcharset0 LucidaGrande;
 \f3\fswiss\fcharset0 ArialMT;\f4\fmodern\fcharset0 Courier-Oblique;}
 {\colortbl;\red255\green255\blue255;\red174\green0\blue0;\red0\green0\blue239;}
@ -14,7 +14,7 @@
 \b0\fs24 \cf0 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc
 \cf0 Written by Charlie Fenton\
-Last updated 12/18/08\
+Last updated 3/3/08\
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
 \cf0 \
 This document applies to BOINC version 6.5.0 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}}.  \
@ -124,7 +124,7 @@ You also need to install Subversion itself.  One place to get it is:\

 \b0\fs24 \cf0 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-\cf0 BOINC depends on four third-party libraries: wxMac-2.8.7, c-ares-1.6.0, curl-7.19.2, and jpeg-6b.  You can obtain these from the following URLs:\
+\cf0 BOINC depends on four third-party libraries: wxMac-2.8.7, c-ares-1.6.0, curl-7.19.4, and jpeg-6b.  You can obtain these from the following URLs:\
 \
 wxMac-2.8.7 (needed  only if you are building the BOINC Manager):\
 	{\field{\*\fldinst{HYPERLINK "http://www.wxwidgets.org"}}{\fldrslt 
@ -136,11 +136,11 @@ wxMac-2.8.7 (needed  only if you are building the BOINC Manager):\
 \f1\fs26 \

 \f0\fs24 \
-curl-7.19.2:\
+curl-7.19.4:\
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural

 \f1\fs26 \cf0 	{\field{\*\fldinst{HYPERLINK "http://curl.haxx.se"}}{\fldrslt http://curl.haxx.se}}\
-	{\field{\*\fldinst{HYPERLINK "http://curl.haxx.se/download/curl-7.19.2.tar.gz"}}{\fldrslt http://curl.haxx.se/download/curl-7.19.2.tar.gz}}\
+	{\field{\*\fldinst{HYPERLINK "http://curl.haxx.se/download/curl-7.19.4.tar.gz"}}{\fldrslt http://curl.haxx.se/download/curl-7.19.4.tar.gz}}\
 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural

@ -168,7 +168,7 @@ jpeg-6b (needed  only if you are building the BOINC libboinc_graphics_api.a libr
 \f4\fs26 autoconf --version
 \f0\fs24  or 
 \f4\fs26 automake --version
-\f0\fs24 .  Building curl-7.19.2 requires autoconf 2.59 and automake 1.9.3 or later.  \
+\f0\fs24 .  Building curl-7.19.4 requires autoconf 2.59 and automake 1.9.3 or later.  \
 \
 Upgrades for autoconf and automake are available from www.gnu.org:  \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
@ -192,7 +192,7 @@ XCode installed these utilities in the
 \i0 \cf0 \
 \pard\pardeftab720\sa260\ql\qnatural
 \cf0 All BOINC software for Power PC Macs must be built using MacOS10.3.9 SDK to assure backward compatibility with OS 10.3.9.\uc0\u8232 All 32-bit BOINC software for Intel Macs must be built using GCC 4.0 and MacOS10.4.u SDK to allow cross-compiling.\u8232 All 64-bit BOINC software for Intel Macs must be built using GCC 4.0 and MacOS10.5 SDK.\
-These are not done by either the XCode projects which come with wxMac-2.8.7, nor  the AutoMake scripts supplied with wxMac-2.8.7, c-ares-1.6.0, curl-7.19.2, or jpeg-6b.  So be sure to use our special scripts to build these packages.\
+These are not done by either the XCode projects which come with wxMac-2.8.7, nor  the AutoMake scripts supplied with wxMac-2.8.7, c-ares-1.6.0, curl-7.19.4, or jpeg-6b.  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\ql\qnatural\pardirnatural
 \cf0 Building BOINC and the library packages on which it depends requires OS 10.5 and XCode 3.0 (or greater).  \
 \
@ -203,7 +203,7 @@ These are not done by either the XCode projects which come with wxMac-2.8.7, nor
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural

 \f1\fs26 \cf0     c-ares-1.6.0\
-    curl-7.19.2\
+    curl-7.19.4\
    jpeg-6b\
    wxMac-2.8.7\
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
--- a/mac_build/boinc.xcodeproj/project.pbxproj
+++ b/mac_build/boinc.xcodeproj/project.pbxproj
@ -204,6 +204,7 @@
 		DD7BF7E80B8E7BBE00A009F7 /* work_fetch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD7BF7E70B8E7BBE00A009F7 /* work_fetch.cpp */; };
 		DD7DD79B0B8BFA4000B11279 /* ViewResources.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD81C42307C5D1D70098A04D /* ViewResources.cpp */; };
 		DD7DD7C90B8BFD4800B11279 /* ViewMessages.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD81C42507C5D1D70098A04D /* ViewMessages.cpp */; };
+		DD85AE4B0F5D284D0031F7AC /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD1929D80918A2F100C31BCF /* Security.framework */; };
 		DD89163D0F3B182700DE5B1C /* ss_app.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD89163C0F3B182700DE5B1C /* ss_app.cpp */; };
 		DD89165A0F3B1B9000DE5B1C /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDFE854A0B60CFD0009B43D9 /* AppKit.framework */; };
 		DD89165F0F3B1BC200DE5B1C /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD89165D0F3B1BC200DE5B1C /* GLUT.framework */; };
@ -1095,6 +1096,7 @@
 			files = (
 				DD130F320820C47C001A0291 /* IOKit.framework in Frameworks */,
 				DD431FAA0A41660D0060585A /* Carbon.framework in Frameworks */,
+				DD85AE4B0F5D284D0031F7AC /* Security.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -3292,11 +3294,9 @@
 				DEPLOYMENT_POSTPROCESSING = YES;
 				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
-				HEADER_SEARCH_PATHS = "../../curl-7.19.2/include";
+				HEADER_SEARCH_PATHS = "../../curl-7.19.4/include";
 				OTHER_LDFLAGS = (
-					"-framework",
-					Security,
-					"../../curl-7.19.2/lib/.libs/libcurl.a",
+					"../../curl-7.19.4/lib/.libs/libcurl.a",
 					"../../c-ares-1.6.0/.libs/libcares.a",
 					"-lcrypto",
 					"-lssl",
@ -3321,9 +3321,9 @@
 				DEPLOYMENT_POSTPROCESSING = YES;
 				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
-				HEADER_SEARCH_PATHS = "../../curl-7.19.2/include";
+				HEADER_SEARCH_PATHS = "../../curl-7.19.4/include";
 				OTHER_LDFLAGS = (
-					"../../curl-7.19.2/lib/.libs/libcurl.a",
+					"../../curl-7.19.4/lib/.libs/libcurl.a",
 					"../../c-ares-1.6.0/.libs/libcares.a",
 					"-lcrypto",
 					"-lssl",
@ -3964,9 +3964,9 @@
 				DEPLOYMENT_POSTPROCESSING = YES;
 				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
-				HEADER_SEARCH_PATHS = "../../curl-7.19.2/include";
+				HEADER_SEARCH_PATHS = "../../curl-7.19.4/include";
 				OTHER_LDFLAGS = (
-					"../../curl-7.19.2/lib/.libs/libcurl.a",
+					"../../curl-7.19.4/lib/.libs/libcurl.a",
 					"../../c-ares-1.6.0/.libs/libcares.a",
 					"-lcrypto",
 					"-lssl",
@ -4281,9 +4281,9 @@
 				DEPLOYMENT_POSTPROCESSING = YES;
 				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
-				HEADER_SEARCH_PATHS = "../../curl-7.19.2/include";
+				HEADER_SEARCH_PATHS = "../../curl-7.19.4/include";
 				OTHER_LDFLAGS = (
-					"../../curl-7.19.2/lib/.libs/libcurl.a",
+					"../../curl-7.19.4/lib/.libs/libcurl.a",
 					"../../c-ares-1.6.0/.libs/libcares.a",
 					"-lcrypto",
 					"-lssl",
@ -4559,11 +4559,9 @@
 				DEPLOYMENT_POSTPROCESSING = YES;
 				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
-				HEADER_SEARCH_PATHS = "../../curl-7.19.2/include";
+				HEADER_SEARCH_PATHS = "../../curl-7.19.4/include";
 				OTHER_LDFLAGS = (
-					"-framework",
-					Security,
-					"../../curl-7.19.2/lib/.libs/libcurl.a",
+					"../../curl-7.19.4/lib/.libs/libcurl.a",
 					"../../c-ares-1.6.0/.libs/libcares.a",
 					"-lcrypto",
 					"-lssl",
@ -4585,9 +4583,9 @@
 				DEPLOYMENT_POSTPROCESSING = YES;
 				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
-				HEADER_SEARCH_PATHS = "../../curl-7.19.2/include";
+				HEADER_SEARCH_PATHS = "../../curl-7.19.4/include";
 				OTHER_LDFLAGS = (
-					"../../curl-7.19.2/lib/.libs/libcurl.a",
+					"../../curl-7.19.4/lib/.libs/libcurl.a",
 					"../../c-ares-1.6.0/.libs/libcares.a",
 					"-lcrypto",
 					"-lssl",
@ -4901,9 +4899,9 @@
 				DEPLOYMENT_POSTPROCESSING = YES;
 				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
-				HEADER_SEARCH_PATHS = "../../curl-7.19.2/include";
+				HEADER_SEARCH_PATHS = "../../curl-7.19.4/include";
 				OTHER_LDFLAGS = (
-					"../../curl-7.19.2/lib/.libs/libcurl.a",
+					"../../curl-7.19.4/lib/.libs/libcurl.a",
 					"../../c-ares-1.6.0/.libs/libcares.a",
 					"-lcrypto",
 					"-lssl",
--- a/mac_build/buildcurl.sh
+++ b/mac_build/buildcurl.sh
@ -18,14 +18,14 @@
 # along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 #
 #
-# Script to build Macintosh Universal Binary library of curl-7.19.2 for
+# Script to build Macintosh Universal Binary library of curl-7.19.4 for
 # use in building BOINC.
 #
 # by Charlie Fenton 7/21/06
-# Updated 1/20/09
+# Updated 3/3/09
 #
-## In Terminal, CD to the curl-7.19.2 directory.
-##     cd [path]/curl-7.19.2/
+## In Terminal, CD to the curl-7.19.4 directory.
+##     cd [path]/curl-7.19.4/
 ## then run this script:
 ##     source [path]/buildcurl.sh [ -clean ] [ -gcc33 ]
 ##
@ -56,7 +56,7 @@ fi
 fi

 if [ $AlreadyBuilt -ne 0 ]; then
-    echo "curl-7.19.2 already built"
+    echo "curl-7.19.4 already built"
    return 0
 fi

--- a/mac_build/setupForBOINC.sh
+++ b/mac_build/setupForBOINC.sh
@ -19,11 +19,11 @@
 #
 #
 # Master script to build Universal Binary libraries needed by BOINC:
-# curl-7.19.2 with c-ares-1.6.0, jpeg-6b and wxMac-2.8.7
+# curl-7.19.4 with c-ares-1.6.0, jpeg-6b and wxMac-2.8.7
 #
 # by Charlie Fenton 7/21/06
 # Bug fix for wxMac-2.6.3 7/26/07
-# Updated 12/17/08 for curl-7.19.2, c-ares-1.6.0 and wxMac-2.8.7
+# Updated 3/3/08 for curl-7.19.4, c-ares-1.6.0 and wxMac-2.8.7
 #
 # Download these three packages and place them in a common parent 
 # directory with the BOINC source tree.
@ -60,13 +60,13 @@ if [  $? -ne 0 ]; then return 1; fi

 echo ""
 echo "----------------------------------"
-echo "------- BUILD CURL-7.19.2 --------"
+echo "------- BUILD CURL-7.19.4 --------"
 echo "----------------------------------"
 echo ""

 cd "${SCRIPT_DIR}"

-cd ../../curl-7.19.2/
+cd ../../curl-7.19.4/
 if [  $? -ne 0 ]; then return 1; fi
 source "${SCRIPT_DIR}/buildcurl.sh" ${doclean}
 if [  $? -ne 0 ]; then return 1; fi