From 56023e100e03c17137bc0fe9381790290bdc9f7c Mon Sep 17 00:00:00 2001 From: Sam Bingner Date: Tue, 3 Dec 2019 10:53:47 -1000 Subject: Update openssl and make it work with AppleTV --- data/_openssl1.0/iphoneos.diff | 39 ++++++++++++------------------- data/_openssl1.0/make.sh | 5 ++-- data/_openssl1.1.1/_metadata/version | 2 +- data/_openssl1.1.1/iphoneos.diff | 26 ++++++++++----------- data/_openssl1.1.1/make.sh | 19 +++++++++++---- data/_openssl1.1.1/openssl-1.1.1c.tar.gz | Bin 8864262 -> 0 bytes data/_openssl1.1.1/openssl-1.1.1d.tar.gz | Bin 0 -> 8845861 bytes data/libssl1.0/_metadata/in.1200.00 | 0 data/libssl1.0/_metadata/postrm | 15 ++++++++++++ data/libssl1.0/_metadata/preinst | 8 +++++++ data/libssl1.1.1/_metadata/in.1200.00 | 0 data/libssl1.1.1/_metadata/postrm | 9 +++++++ data/libssl1.1.1/_metadata/preinst | 8 +++++++ data/openssl/_metadata/depends | 2 +- data/openssl/_metadata/in.1200.00 | 0 data/openssl/_metadata/libssl1.0.dep | 1 - data/openssl/_metadata/libssl1.0.ver | 1 - data/openssl/_metadata/libssl1.1.1.dep | 1 + data/openssl/_metadata/license | 2 +- data/openssl/_metadata/maintainer | 2 +- data/openssl/_metadata/priority | 2 +- data/openssl/_metadata/role | 2 +- data/openssl/_metadata/section | 2 +- data/openssl/_metadata/tags | 2 +- data/openssl/_metadata/version | 2 +- data/openssl/make.sh | 7 +++--- 26 files changed, 100 insertions(+), 57 deletions(-) delete mode 100644 data/_openssl1.1.1/openssl-1.1.1c.tar.gz create mode 100644 data/_openssl1.1.1/openssl-1.1.1d.tar.gz create mode 100644 data/libssl1.0/_metadata/in.1200.00 create mode 100755 data/libssl1.0/_metadata/postrm create mode 100755 data/libssl1.0/_metadata/preinst create mode 100644 data/libssl1.1.1/_metadata/in.1200.00 create mode 100755 data/libssl1.1.1/_metadata/postrm create mode 100755 data/libssl1.1.1/_metadata/preinst create mode 100644 data/openssl/_metadata/in.1200.00 delete mode 120000 data/openssl/_metadata/libssl1.0.dep delete mode 120000 data/openssl/_metadata/libssl1.0.ver create mode 120000 data/openssl/_metadata/libssl1.1.1.dep diff --git a/data/_openssl1.0/iphoneos.diff b/data/_openssl1.0/iphoneos.diff index 6dfc5ea46..67020e994 100644 --- a/data/_openssl1.0/iphoneos.diff +++ b/data/_openssl1.0/iphoneos.diff @@ -1,33 +1,24 @@ -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,9 @@ - "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", +diff -ur openssl-1.0.2s/Configure openssl-1.0.2s+iOS/Configure +--- openssl-1.0.2s/Configure 2019-09-04 14:58:20.000000000 -1000 ++++ openssl-1.0.2s+iOS/Configure 2019-05-28 02:41:37.000000000 -1000 +@@ -654,6 +654,7 @@ "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", -+"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-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", ++"ios-cross","\$(PKG_TARG)-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:::", -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,12 @@ - armv6+7-*-iphoneos) - options="$options -arch%20armv6 -arch%20armv7" +diff -ur openssl-1.0.2s/config openssl-1.0.2s+iOS/config +--- openssl-1.0.2s/config 2019-09-04 14:59:51.000000000 -1000 ++++ openssl-1.0.2s+iOS/config 2019-05-28 02:41:38.000000000 -1000 +@@ -581,6 +581,9 @@ + *-*-iphoneos) + options="$options -arch%20${MACHINE}" OUT="iphoneos-cross" ;; -- *-*-iphoneos) -- options="$options -arch%20${MACHINE}" -- OUT="iphoneos-cross" ;; -+ arm-apple-darwin11) -+ OUT="iphoneos-arm" ;; -+ aarch64-apple-darwin17) -+ OUT="iphoneos-arm" ;; -+ armv7k-apple-darwin11) -+ OUT="watchos-arm" ;; ++ aarch64-*-darwin* ++ arm*-*-darwin*) ++ OUT="ios-cross" ;; alpha-*-linux2) ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo` case ${ISA:-generic} in diff --git a/data/_openssl1.0/make.sh b/data/_openssl1.0/make.sh index f5c84d9f7..5642b6366 100644 --- a/data/_openssl1.0/make.sh +++ b/data/_openssl1.0/make.sh @@ -1,9 +1,10 @@ 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 +echo ./Configure -D__DARWIN_UNIX03 ios-cross --prefix=/usr --openssldir=/usr/lib/ssl shared +./Configure -D__DARWIN_UNIX03 ios-cross --prefix=/usr --openssldir=/usr/lib/ssl shared make AR="${PKG_TARG}-ar -r" -j8 make install_sw 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/openssl.cnf "${PKG_DEST}"/usr/lib/ssl/openssl.cnf rm -rf "${PKG_DEST}"/usr/lib/*.a 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.1c.tar.gz deleted file mode 100644 index 874978a35..000000000 Binary files a/data/_openssl1.1.1/openssl-1.1.1c.tar.gz and /dev/null differ diff --git a/data/_openssl1.1.1/openssl-1.1.1d.tar.gz b/data/_openssl1.1.1/openssl-1.1.1d.tar.gz new file mode 100644 index 000000000..216017a51 Binary files /dev/null and b/data/_openssl1.1.1/openssl-1.1.1d.tar.gz differ diff --git a/data/libssl1.0/_metadata/in.1200.00 b/data/libssl1.0/_metadata/in.1200.00 new file mode 100644 index 000000000..e69de29bb diff --git a/data/libssl1.0/_metadata/postrm b/data/libssl1.0/_metadata/postrm new file mode 100755 index 000000000..131d336fe --- /dev/null +++ b/data/libssl1.0/_metadata/postrm @@ -0,0 +1,15 @@ +#!/bin/sh + +if [ remove = "$1" -o abort-install = "$1" -o disappear = "$1" ]; then + dpkg-divert --package libssl1.0 --remove --rename \ + --divert /usr/lib/libcrypto.1.0.0.dylib.old /usr/lib/libcrypto.1.0.0.dylib + dpkg-divert --package libssl1.0 --remove --rename \ + --divert /usr/lib/libssl.1.0.0.dylib.old /usr/lib/libssl.1.0.0.dylib +fi + +if [ abort-upgrade = "$1" ] && dpkg --compare-versions "$2" le "1.0.2s-1"; then + dpkg-divert --package libssl1.0 --remove --rename \ + --divert /usr/lib/libcrypto.1.0.0.dylib.old /usr/lib/libcrypto.1.0.0.dylib + dpkg-divert --package libssl1.0 --remove --rename \ + --divert /usr/lib/libssl.1.0.0.dylib.old /usr/lib/libssl.1.0.0.dylib +fi diff --git a/data/libssl1.0/_metadata/preinst b/data/libssl1.0/_metadata/preinst new file mode 100755 index 000000000..f38225d1e --- /dev/null +++ b/data/libssl1.0/_metadata/preinst @@ -0,0 +1,8 @@ +#!/bin/sh + +if [ upgrade != "$1" ] || dpkg --compare-versions "$2" le "1.0.2s-1"; then + dpkg-divert --package libssl1.0 --add --rename \ + --divert /usr/lib/libcrypto.1.0.0.dylib.old /usr/lib/libcrypto.1.0.0.dylib + dpkg-divert --package libssl1.0 --add --rename \ + --divert /usr/lib/libssl.1.0.0.dylib.old /usr/lib/libssl.1.0.0.dylib +fi diff --git a/data/libssl1.1.1/_metadata/in.1200.00 b/data/libssl1.1.1/_metadata/in.1200.00 new file mode 100644 index 000000000..e69de29bb diff --git a/data/libssl1.1.1/_metadata/postrm b/data/libssl1.1.1/_metadata/postrm new file mode 100755 index 000000000..b68bb66da --- /dev/null +++ b/data/libssl1.1.1/_metadata/postrm @@ -0,0 +1,9 @@ +#!/bin/sh + +if [ remove = "$1" -o abort-install = "$1" -o disappear = "$1" ] || \ + ( [ abort-upgrade = "$1" ] && dpkg --compare-versions "$2" le "1.1.1c-1" ); then + dpkg-divert --package libssl1.1.1 --remove --rename \ + --divert /usr/lib/libcrypto.1.1.dylib.old /usr/lib/libcrypto.1.1.dylib + dpkg-divert --package libssl1.1.1 --remove --rename \ + --divert /usr/lib/libssl.1.1.dylib.old /usr/lib/libssl.1.1.dylib +fi diff --git a/data/libssl1.1.1/_metadata/preinst b/data/libssl1.1.1/_metadata/preinst new file mode 100755 index 000000000..b99249de8 --- /dev/null +++ b/data/libssl1.1.1/_metadata/preinst @@ -0,0 +1,8 @@ +#!/bin/sh + +if [ upgrade != "$1" ] || dpkg --compare-versions "$2" le "1.1.1c-1"; then + dpkg-divert --package libssl1.1.1 --add --rename \ + --divert /usr/lib/libcrypto.1.1.dylib.old /usr/lib/libcrypto.1.1.dylib + dpkg-divert --package libssl1.1.1 --add --rename \ + --divert /usr/lib/libssl.1.1.dylib.old /usr/lib/libssl.1.1.dylib +fi diff --git a/data/openssl/_metadata/depends b/data/openssl/_metadata/depends index fd4988ec3..bc3c42854 100644 --- a/data/openssl/_metadata/depends +++ b/data/openssl/_metadata/depends @@ -1 +1 @@ -firmware (>=11.0) | libssl0.9.8 +firmware (>=11.0) | libssl0.9.8, libssl1.0 diff --git a/data/openssl/_metadata/in.1200.00 b/data/openssl/_metadata/in.1200.00 new file mode 100644 index 000000000..e69de29bb diff --git a/data/openssl/_metadata/libssl1.0.dep b/data/openssl/_metadata/libssl1.0.dep deleted file mode 120000 index a501d00a8..000000000 --- a/data/openssl/_metadata/libssl1.0.dep +++ /dev/null @@ -1 +0,0 @@ -../../libssl1.0 \ No newline at end of file diff --git a/data/openssl/_metadata/libssl1.0.ver b/data/openssl/_metadata/libssl1.0.ver deleted file mode 120000 index 827dd0dfb..000000000 --- a/data/openssl/_metadata/libssl1.0.ver +++ /dev/null @@ -1 +0,0 @@ -../../libssl1.0/_metadata/version \ No newline at end of file diff --git a/data/openssl/_metadata/libssl1.1.1.dep b/data/openssl/_metadata/libssl1.1.1.dep new file mode 120000 index 000000000..254747b12 --- /dev/null +++ b/data/openssl/_metadata/libssl1.1.1.dep @@ -0,0 +1 @@ +../../libssl1.1.1 \ No newline at end of file diff --git a/data/openssl/_metadata/license b/data/openssl/_metadata/license index 88ecc67af..2f81f423b 120000 --- a/data/openssl/_metadata/license +++ b/data/openssl/_metadata/license @@ -1 +1 @@ -../../_openssl1.0/_metadata/license \ No newline at end of file +../../_openssl1.1.1/_metadata/license \ No newline at end of file diff --git a/data/openssl/_metadata/maintainer b/data/openssl/_metadata/maintainer index 9feba3530..00e974057 120000 --- a/data/openssl/_metadata/maintainer +++ b/data/openssl/_metadata/maintainer @@ -1 +1 @@ -../../_openssl1.0/_metadata/maintainer \ No newline at end of file +../../_openssl1.1.1/_metadata/maintainer \ No newline at end of file diff --git a/data/openssl/_metadata/priority b/data/openssl/_metadata/priority index 7b8c4d01f..ce9e61a5b 120000 --- a/data/openssl/_metadata/priority +++ b/data/openssl/_metadata/priority @@ -1 +1 @@ -../../_openssl1.0/_metadata/priority \ No newline at end of file +../../_openssl1.1.1/_metadata/priority \ No newline at end of file diff --git a/data/openssl/_metadata/role b/data/openssl/_metadata/role index 2948edd45..219e60779 120000 --- a/data/openssl/_metadata/role +++ b/data/openssl/_metadata/role @@ -1 +1 @@ -../../_openssl1.0/_metadata/role \ No newline at end of file +../../_openssl1.1.1/_metadata/role \ No newline at end of file diff --git a/data/openssl/_metadata/section b/data/openssl/_metadata/section index 4372ae2c4..859bd927c 120000 --- a/data/openssl/_metadata/section +++ b/data/openssl/_metadata/section @@ -1 +1 @@ -../../_openssl1.0/_metadata/section \ No newline at end of file +../../_openssl1.1.1/_metadata/section \ No newline at end of file diff --git a/data/openssl/_metadata/tags b/data/openssl/_metadata/tags index 575278f73..585678015 120000 --- a/data/openssl/_metadata/tags +++ b/data/openssl/_metadata/tags @@ -1 +1 @@ -../../_openssl1.0/_metadata/tags \ No newline at end of file +../../_openssl1.1.1/_metadata/tags \ No newline at end of file diff --git a/data/openssl/_metadata/version b/data/openssl/_metadata/version index 7c50f5d10..ad14c9cd9 120000 --- a/data/openssl/_metadata/version +++ b/data/openssl/_metadata/version @@ -1 +1 @@ -../../_openssl1.0/_metadata/version \ No newline at end of file +../../_openssl1.1.1/_metadata/version \ No newline at end of file diff --git a/data/openssl/make.sh b/data/openssl/make.sh index 3f7c2dc0b..bfee4bef8 100644 --- a/data/openssl/make.sh +++ b/data/openssl/make.sh @@ -1,4 +1,5 @@ pkg: mkdir -p /usr/lib -cp -a "$(PKG_DEST_ _openssl1.0)"/etc "${PKG_DEST}"/ -cp -a "$(PKG_DEST_ _openssl1.0)"/usr/bin "${PKG_DEST}"/usr -cp -a "$(PKG_DEST_ _openssl1.0)"/usr/lib/ssl "${PKG_DEST}"/usr/lib +cp -a "$(PKG_DEST_ _openssl1.1.1)"/etc "${PKG_DEST}"/ +cp -a "$(PKG_DEST_ _openssl1.1.1)"/usr/bin "${PKG_DEST}"/usr +cp -a "$(PKG_DEST_ _openssl1.1.1)"/usr/lib/ssl "${PKG_DEST}"/usr/lib +rm "${PKG_DEST}"/usr/lib/ssl/*.dist -- cgit v1.2.3