Update openssl and make it work with AppleTV

4 files changed, 29 insertions, 18 deletions

diff --git a/data/_openssl1.1.1/_metadata/version b/data/_openssl1.1.1/_metadata/version
index 12bef82b0..c821ae960 100644
--- a/data/_openssl1.1.1/_metadata/version
+++ b/data/_openssl1.1.1/_metadata/version
@@ -1 +1 @@
-1.1.1c
+1.1.1d
diff --git a/data/_openssl1.1.1/iphoneos.diff b/data/_openssl1.1.1/iphoneos.diff
index e1d5d429b..e805f5395 100644
--- a/data/_openssl1.1.1/iphoneos.diff
+++ b/data/_openssl1.1.1/iphoneos.diff
@@ -1,24 +1,24 @@
-diff -urN openssl-1.1.1b/Configurations/20-elucubratus.conf openssl-1.1.1b+iPhone/Configurations/20-elucubratus.conf
---- openssl-1.1.1b/Configurations/20-elucubratus.conf	1969-12-31 14:00:00.000000000 -1000
-+++ openssl-1.1.1b+iPhone/Configurations/20-elucubratus.conf	2019-05-21 15:33:25.000000000 -1000
+diff -urN openssl-1.1.1c/Configurations/20-elucubratus.conf openssl-1.1.1c+iOS/Configurations/20-elucubratus.conf
+--- openssl-1.1.1c/Configurations/20-elucubratus.conf	1969-12-31 14:00:00.000000000 -1000
++++ openssl-1.1.1c+iOS/Configurations/20-elucubratus.conf	2019-09-04 15:24:00.000000000 -1000
 @@ -0,0 +1,20 @@
 +#### iPhoneOS/iOS
 +#
-+# It takes recent enough XCode to use following two targets. It shouldn't
-+# be a problem by now, but if they don't work, original targets below
-+# that depend on manual definition of environment variables should still
-+# work...
 +#
 +my %targets = (
-+    "aarch64-apple-darwin17" => {
++    "iphoneos-arm32" => {
++        inherit_from     => [ "darwin-common", asm("armv4_asm") ],
++        CC               => "$(PKG_TARG)-gcc",
++        cflags           => add("-O2 -fomit-frame-pointer -fno-common"),
++        perlasm_scheme   => "ios32",
++        sys_id           => "ios",
++    },
++    "iphoneos-arm64" => {
 +        inherit_from     => [ "darwin-common", asm("aarch64_asm") ],
-+        CC               => "aarch64-apple-darwin17-gcc",
++        CC               => "$(PKG_TARG)-gcc",
 +        cflags           => add("-O2 -fomit-frame-pointer -fno-common"),
 +        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
 +        perlasm_scheme   => "ios64",
-+        sys_id           => "iphoneos",
++        sys_id           => "ios",
 +    },
 +);
-+#   +"arm-apple-darwin11","arm-apple-darwin11-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",
-+#        +"armv7k-apple-darwin11","armv7k-apple-darwin11-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",
-+#        +"aarch64-apple-darwin17","aarch64-apple-darwin17-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-arm"
diff --git a/data/_openssl1.1.1/make.sh b/data/_openssl1.1.1/make.sh
index 93e01af60..3a708dd22 100644
--- a/data/_openssl1.1.1/make.sh
+++ b/data/_openssl1.1.1/make.sh
@@ -1,8 +1,19 @@
 pkg:setup
-echo ./Configure -D__DARWIN_UNIX03 "${PKG_TARG}" --prefix=/usr --openssldir=/usr/lib/ssl shared
-./Configure -D__DARWIN_UNIX03 "${PKG_TARG}" --prefix=/usr --openssldir=/usr/lib/ssl shared
+case ${PKG_TARG} in
+    aarch64-*)
+        TARGET="iphoneos-arm64" ;;
+    arm*)
+        TARGET="iphoneos-arm32" ;;
+    *)
+        echo "Unknown PKG_TARG: " ${PKG_TARG} ;;
+esac
+
+echo ./Configure -D__DARWIN_UNIX03 ${TARGET} --prefix=/usr --openssldir=/usr/lib/ssl shared
+./Configure -D__DARWIN_UNIX03 ${TARGET} --prefix=/usr --openssldir=/usr/lib/ssl shared
 pkg:make
-make install_sw DESTDIR="${PKG_DEST}"
+make install_sw install_ssldirs DESTDIR="${PKG_DEST}"
 pkg: rm -rf /usr/lib/man /usr/lib/ssl/man
 pkg: mkdir -p /etc/ssl
-rm -rf "${PKG_DEST}"/usr/lib/*.a
+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/
+rm -rf "${PKG_DEST}"/usr/lib/*.a "${PKG_DEST}"/etc/ssl/*.dist
diff --git a/data/_openssl1.1.1/openssl-1.1.1c.tar.gz b/data/_openssl1.1.1/openssl-1.1.1d.tar.gz
index 874978a35..216017a51 100644
--- a/data/_openssl1.1.1/openssl-1.1.1c.tar.gz
+++ b/data/_openssl1.1.1/openssl-1.1.1d.tar.gz