Changeset 68

Timestamp:

05/05/06 15:04:15 (3 years ago)

Author:

jps

Message:

Upgrade OpenSSL to 0.9.8b

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Makefile (modified) (3 diffs)
• Makefile_i386 (modified) (2 diffs)
• howto (modified) (2 diffs)
• openssl-pack/Info.plist (modified) (1 diff)
• openssl097i-i386.diff (deleted)

trunk/ChangeLog

@@ -4 +4 @@
 - OpenSC: upgrade to 0.11.0
 - OpenSSH: upgrade to 4.3p2
-- OpenSSL: 0.9.7i (need to be patched (openssl097i-i386.diff) for MacIntel!)
+- OpenSSL: upgrade to 0.9.8b
 - libusb: upgrade to 0.1.12
 - create a symbolic link /usr/lib/opensc-pkcs11.so (it will be in the pkcs11-tool's

trunk/Makefile

@@ -1 +1 @@
 BUILDHOME = $(PWD)
 OPENSCVERSION = 0.11.0
-SCAVERSION = 0.1.9pre5
+SCAVERSION = 0.1.9pre6
 LIBP11VERSION = 0.2.1
 ENGINEVERSION = 0.1.3
-OPENSSLVERSION = 0.9.7i
-#OPENSSLVERSION = 0.9.8-stable-SNAP-20060426
+OPENSSLVERSION = 0.9.8b
 OPENSSHVERSION = 4.3p2
 IFDEGATEVERSION = 0.05
@@ -280 +279 @@
         touch build-pcscd_autostart
         
-lipo: lipo-openssl7 lipo-opensc lipo-engine lipo-libp11 lipo-openssh lipo-libusb lipo-ifd-egate
-        
-lipo-openssl8: compiled-openssl-i386
+lipo: lipo-openssl lipo-opensc lipo-engine lipo-libp11 lipo-openssh lipo-libusb lipo-ifd-egate
+        
+lipo-openssl: compiled-openssl-i386
         cd compiled-openssl/Library/OpenSC/bin/ && \
         lipo -create openssl ../../../../compiled-openssl-i386/Library/OpenSC/bin/openssl -output openssl_univ && \
@@ -327 +326 @@
         touch lipo-openssl
 
-lipo-openssl7: compiled-openssl-i386
-        cd compiled-openssl/Library/OpenSC/bin/ && \
-        lipo -create openssl ../../../../compiled-openssl-i386/Library/OpenSC/bin/openssl -output openssl_univ && \
-        mv -f openssl_univ openssl
-        cd compiled-openssl/Library/OpenSC/lib/ && \
-        lipo -create libcrypto.a ../../../../compiled-openssl-i386/Library/OpenSC/lib/libcrypto.a -output libcrypto_univ.a && \
-        mv -f libcrypto_univ.a libcrypto.a
-        cd compiled-openssl/Library/OpenSC/lib/ && \
-        lipo -create libssl.a ../../../../compiled-openssl-i386/Library/OpenSC/lib/libssl.a -output libssl_univ.a && \
-        mv -f libssl_univ.a libssl.a
-        cd compiled-openssl/Library/OpenSC/lib/ && \
-        lipo -create libcrypto.0.9.7.dylib ../../../../compiled-openssl-i386/Library/OpenSC/lib/libcrypto.0.9.7.dylib -output libcrypto_univ.0.9.7.dylib && \
-        mv -f libcrypto_univ.0.9.7.dylib libcrypto.0.9.7.dylib
-        cd compiled-openssl/Library/OpenSC/lib/ && \
-        lipo -create libssl.0.9.7.dylib ../../../../compiled-openssl-i386/Library/OpenSC/lib/libssl.0.9.7.dylib -output libssl_univ.0.9.7.dylib && \
-        mv -f libssl_univ.0.9.7.dylib libssl.0.9.7.dylib
-        touch lipo-openssl
-        
 lipo-opensc: compiled-opensc-i386
         cd compiled-opensc/Library/OpenSC/bin/ && \

trunk/Makefile_i386

@@ -1 +1 @@
 BUILDHOME = $(PWD)
-OPENSSLVERSION = 0.9.7i
-#OPENSSLVERSION = 0.9.8-stable-SNAP-20060426
+OPENSSLVERSION = 0.9.8b
 OPENSCVERSION = 0.11.0
 OPENSSHVERSION = 4.3p2
@@ -78 +77 @@
         tar xzvf $^
         mv openssl-$(OPENSSLVERSION) openssl
-        cd openssl && patch < ../openssl097i-i386.diff
         touch fetch-openssl
         

trunk/howto

@@ -36 +36 @@
         The MacIntel need to have the Developer Xcode installed which is available
         on the Installation DVD.
-        Transfer the Makefile_i386 and openssl097i-i386.diff
+        Transfer the Makefile_i386
         and then do:
         make -f Makefile_i386 all ; make -f Makefile_i386 transfer
@@ -63 +63 @@
         The MacIntel need to have the Developer Xcode installed which is available
         on the Installation DVD.
-        Transfer the Makefile_light_i386 and openssl097i-i386.diff
+        Transfer the Makefile_light_i386
         and then do:
         make -f Makefile_light_i386 all ; make -f Makefile_light_i386 transfer

trunk/openssl-pack/Info.plist

@@ -4 +4 @@
 <dict>
         <key>CFBundleGetInfoString</key>
-        <string>0.9.7i, OpenSC Project</string>
+        <string>0.9.8b, OpenSC Project</string>
         <key>CFBundleIdentifier</key>
         <string>org.opensc.openssl</string>
         <key>CFBundleShortVersionString</key>
-        <string>0.9.7</string>
+        <string>0.9.8</string>
         <key>IFPkgFlagAllowBackRev</key>
         <true/>