Update openssl to 1.0.2o and add support for arm64

7 files changed, 33 insertions, 26 deletions

diff --git a/data/openssl/_metadata/depends b/data/openssl/_metadata/depends
new file mode 100644
index 000000000..a779e5d04
--- /dev/null
+++ b/data/openssl/_metadata/depends
@@ -0,0 +1 @@
+ca-certificates
diff --git a/data/openssl/_metadata/version b/data/openssl/_metadata/version
index ef2fbf0bc..44a7436c8 100644
--- a/data/openssl/_metadata/version
+++ b/data/openssl/_metadata/version
@@ -1 +1 @@
-0.9.8zc
+1.0.2o
diff --git a/data/openssl/iphoneos.diff b/data/openssl/iphoneos.diff
index 2b027d18a..f6eb68e53 100644
--- a/data/openssl/iphoneos.diff
+++ b/data/openssl/iphoneos.diff
@@ -1,15 +1,30 @@
-diff -ru openssl-0.9.8h/Configure openssl-0.9.8h+iPhone/Configure
---- openssl-0.9.8h/Configure	2008-05-01 23:11:30.000000000 +0000
-+++ openssl-0.9.8h+iPhone/Configure	2008-09-13 07:14:52.000000000 +0000
-@@ -515,6 +515,11 @@
- "darwin64-x86_64-cc","cc:-arch x86_64 -O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
- "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::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+diff -ur openssl-1.0.2o/Configure openssl-1.0.2o+iPhone/Configure
+--- openssl-1.0.2o/Configure	2018-03-27 03:54:46.000000000 -1000
++++ openssl-1.0.2o+iPhone/Configure	2018-07-24 11:49:38.000000000 -1000
+@@ -652,7 +652,8 @@
+ "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",
+ "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",
++"iphoneos-armv6","arm-apple-darwin9-gcc:-O3 -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",
++"iphoneos-arm64","aarch64-apple-darwin13-gcc:-O3 -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",
  
-+##### iPhoneOS
-+"darwin-arm-gcc","arm-apple-darwin-gcc:-arch arm -O3 -fomit-frame-pointer -fno-common::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch arm -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib:arm-apple-darwin-ranlib",
-+"darwin8-arm-gcc","arm-apple-darwin8-gcc:-O3 -fomit-frame-pointer -fno-common::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch arm -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib:arm-apple-darwin8-ranlib",
-+"darwin9-arm-gcc","arm-apple-darwin9-gcc:-O3 -fomit-frame-pointer -fno-common::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch arm -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib:arm-apple-darwin9-ranlib",
-+
  ##### A/UX
  "aux3-gcc","gcc:-O2 -DTERMIO::(unknown):AUX:-lbsd:RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::",
- 
+diff -ur openssl-1.0.2o/config openssl-1.0.2o+iPhone/config
+--- openssl-1.0.2o/config	2018-03-27 03:54:46.000000000 -1000
++++ openssl-1.0.2o+iPhone/config	2018-07-24 11:54:37.000000000 -1000
+@@ -578,9 +578,10 @@
+   armv6+7-*-iphoneos)
+ 	options="$options -arch%20armv6 -arch%20armv7"
+ 	OUT="iphoneos-cross" ;;
+-  *-*-iphoneos)
+-	options="$options -arch%20${MACHINE}"
+-	OUT="iphoneos-cross" ;;
++  iphoneos-arm)
++	OUT="iphoneos-arm" ;;
++  iphoneos-arm64)
++	OUT="iphoneos-arm64" ;;
+   alpha-*-linux2)
+         ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo`
+ 	case ${ISA:-generic} in
diff --git a/data/openssl/make.sh b/data/openssl/make.sh
index 750726236..ba217e0e5 100644
--- a/data/openssl/make.sh
+++ b/data/openssl/make.sh
@@ -1,9 +1,11 @@
 pkg:setup
-./Configure -D__DARWIN_UNIX03 "$(echo "${PKG_TARG}" | sed -e 's/\(.*\)-\(.*\)-\(.*\)/\3-\1/')-gcc" --prefix=/usr --openssldir=/usr/lib/ssl shared
-make AR="${PKG_TARG}-ar -r"
+echo ./Configure -D__DARWIN_UNIX03 "${PKG_ARCH}" --prefix=/usr --openssldir=/usr/lib/ssl shared
+./Configure -D__DARWIN_UNIX03 "${PKG_ARCH}" --prefix=/usr --openssldir=/usr/lib/ssl shared
+make AR="${PKG_TARG}-ar -r" -j8
 make install INSTALL_PREFIX="${PKG_DEST}"
 pkg: rm -rf /usr/lib/man /usr/lib/ssl/man
 pkg: mkdir -p /etc/ssl
 mv "${PKG_DEST}"/usr/lib/ssl/{certs,openssl.cnf,private} "${PKG_DEST}"/etc/ssl
 ln -s /etc/ssl/{certs,openssl.cnf,private} "${PKG_DEST}"/usr/lib/ssl
+pkg: ln -s certs/cacert.pem /usr/lib/ssl/cert.pem
 rm -rf "${PKG_DEST}"/usr/lib/*.a
diff --git a/data/openssl/openssl-0.9.8zc.tar.gz b/data/openssl/openssl-0.9.8zc.tar.gz
deleted file mode 100644
index adfc84d34..000000000
--- a/data/openssl/openssl-0.9.8zc.tar.gz
+++ /dev/null
diff --git a/data/openssl/openssl-1.0.2o.tar.gz b/data/openssl/openssl-1.0.2o.tar.gz
new file mode 100644
index 000000000..fff6a9003
--- /dev/null
+++ b/data/openssl/openssl-1.0.2o.tar.gz
diff --git a/data/openssl/timestamp.diff b/data/openssl/timestamp.diff
deleted file mode 100644
index f1e61a446..000000000
--- a/data/openssl/timestamp.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru openssl-0.9.8g/crypto/Makefile openssl-0.9.8g+iPhone/crypto/Makefile
---- openssl-0.9.8g/crypto/Makefile	2006-02-04 01:48:41.000000000 +0000
-+++ openssl-0.9.8g+iPhone/crypto/Makefile	2008-06-17 20:45:57.000000000 +0000
-@@ -54,7 +54,6 @@
- 	echo '  /* auto-generated by crypto/Makefile for crypto/cversion.c */'; \
- 	echo '  #define CFLAGS "$(CC) $(CFLAG)"'; \
- 	echo '  #define PLATFORM "$(PLATFORM)"'; \
--	echo "  #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \
- 	echo '#endif' ) >buildinf.h
- 
- x86cpuid-elf.s:	x86cpuid.pl perlasm/x86asm.pl