From dabe8669a56fca398da9a7dd117eb74f874cddc0 Mon Sep 17 00:00:00 2001
From: Sam Bingner <sam@bingner.com>
Date: Fri, 7 Dec 2018 13:01:05 -1000
Subject: Update to use libapt instead of apt7-lib for apt1.4+ and add
 apt-rdepends

---
 data/openssl/iphoneos.diff | 8 ++++----
 data/openssl/make.sh       | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'data/openssl')

diff --git a/data/openssl/iphoneos.diff b/data/openssl/iphoneos.diff
index 62b171cf4..3e22940fd 100644
--- a/data/openssl/iphoneos.diff
+++ b/data/openssl/iphoneos.diff
@@ -6,8 +6,8 @@ diff -ur openssl-1.0.2o/Configure openssl-1.0.2o+iPhone/Configure
  "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-arm","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-arm","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",
++"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",
++"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",
  
  ##### A/UX
  "aux3-gcc","gcc:-O2 -DTERMIO::(unknown):AUX:-lbsd:RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::",
@@ -21,9 +21,9 @@ diff -ur openssl-1.0.2o/config openssl-1.0.2o+iPhone/config
 -  *-*-iphoneos)
 -	options="$options -arch%20${MACHINE}"
 -	OUT="iphoneos-cross" ;;
-+  iphoneos-arm)
++  arm-apple-darwin11)
 +	OUT="iphoneos-arm" ;;
-+  iphoneos-arm64)
++  aarch64-apple-darwin17)
 +	OUT="iphoneos-arm" ;;
    alpha-*-linux2)
          ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo`
diff --git a/data/openssl/make.sh b/data/openssl/make.sh
index ba217e0e5..d83b0e547 100644
--- a/data/openssl/make.sh
+++ b/data/openssl/make.sh
@@ -1,6 +1,6 @@
 pkg:setup
-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
+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
 make AR="${PKG_TARG}-ar -r" -j8
 make install INSTALL_PREFIX="${PKG_DEST}"
 pkg: rm -rf /usr/lib/man /usr/lib/ssl/man
-- 
cgit v1.2.3