15 files changed, 16 insertions, 176 deletions
diff --git a/data/openssl/_metadata/depends b/data/openssl/_metadata/depends
index a779e5d04..fd4988ec3 100644
--- a/data/openssl/_metadata/depends
+++ b/data/openssl/_metadata/depends
@@ -1 +1 @@
-ca-certificates
+firmware (>=11.0) | libssl0.9.8
diff --git a/data/openssl/_metadata/description b/data/openssl/_metadata/description
index 3750ad4db..9f645abb8 100644
--- a/data/openssl/_metadata/description
+++ b/data/openssl/_metadata/description
@@ -1 +1 @@
-SSL library and cryptographic tools
+OpenSSL tools
diff --git a/data/openssl/_metadata/in.550.58 b/data/openssl/_metadata/in.550.58
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/openssl/_metadata/in.550.58
diff --git a/data/openssl/_metadata/libssl1.0.dep b/data/openssl/_metadata/libssl1.0.dep
new file mode 120000
index 000000000..a501d00a8
--- /dev/null
+++ b/data/openssl/_metadata/libssl1.0.dep
@@ -0,0 +1 @@
+../../libssl1.0
+\ No newline at end of file
diff --git a/data/openssl/_metadata/libssl1.0.ver.iphoneos-arm b/data/openssl/_metadata/libssl1.0.ver.iphoneos-arm
new file mode 120000
index 000000000..827dd0dfb
--- /dev/null
+++ b/data/openssl/_metadata/libssl1.0.ver.iphoneos-arm
@@ -0,0 +1 @@
+../../libssl1.0/_metadata/version
+\ No newline at end of file
diff --git a/data/openssl/_metadata/license b/data/openssl/_metadata/license
index ff99d9724..88ecc67af 100644..120000
--- a/data/openssl/_metadata/license
+++ b/data/openssl/_metadata/license
@@ -1,127 +1 @@
-
-  LICENSE ISSUES
-  ==============
-
-  The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
-  the OpenSSL License and the original SSLeay license apply to the toolkit.
-  See below for the actual license texts. Actually both licenses are BSD-style
-  Open Source licenses. In case of any license issues related to OpenSSL
-  please contact openssl-core@openssl.org.
-
-  OpenSSL License
-  ---------------
-
-/* ====================================================================
- * Copyright (c) 1998-2007 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
- Original SSLeay License
- -----------------------
-
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
+../../_openssl1.0/_metadata/license
+\ No newline at end of file
diff --git a/data/openssl/_metadata/maintainer b/data/openssl/_metadata/maintainer
index 573d7ebef..9feba3530 120000
--- a/data/openssl/_metadata/maintainer
+++ b/data/openssl/_metadata/maintainer
@@ -1 +1 @@
-../../../people/sbingner
-\ No newline at end of file
+../../_openssl1.0/_metadata/maintainer
+\ No newline at end of file
diff --git a/data/openssl/_metadata/priority b/data/openssl/_metadata/priority
index a6a7b9cd7..7b8c4d01f 100644..120000
--- a/data/openssl/_metadata/priority
+++ b/data/openssl/_metadata/priority
@@ -1 +1 @@
-standard
+../../_openssl1.0/_metadata/priority
+\ No newline at end of file
diff --git a/data/openssl/_metadata/role b/data/openssl/_metadata/role
index 8d0320866..2948edd45 100644..120000
--- a/data/openssl/_metadata/role
+++ b/data/openssl/_metadata/role
@@ -1 +1 @@
-developer
+../../_openssl1.0/_metadata/role
+\ No newline at end of file
diff --git a/data/openssl/_metadata/section b/data/openssl/_metadata/section
index 4b487b7d5..4372ae2c4 100644..120000
--- a/data/openssl/_metadata/section
+++ b/data/openssl/_metadata/section
@@ -1 +1 @@
-Security
+../../_openssl1.0/_metadata/section
+\ No newline at end of file
diff --git a/data/openssl/_metadata/tags b/data/openssl/_metadata/tags
index a8928cec8..575278f73 100644..120000
--- a/data/openssl/_metadata/tags
+++ b/data/openssl/_metadata/tags
@@ -1 +1 @@
-purpose::library
+../../_openssl1.0/_metadata/tags
+\ No newline at end of file
diff --git a/data/openssl/_metadata/version b/data/openssl/_metadata/version
index 44a7436c8..7c50f5d10 100644..120000
--- a/data/openssl/_metadata/version
+++ b/data/openssl/_metadata/version
@@ -1 +1 @@
-1.0.2o
+../../_openssl1.0/_metadata/version
+\ No newline at end of file
diff --git a/data/openssl/iphoneos.diff b/data/openssl/iphoneos.diff
deleted file mode 100644
index 62b171cf4..000000000
--- a/data/openssl/iphoneos.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-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-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",
- 
- ##### 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-arm" ;;
-   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 ba217e0e5..cd09794ff 100644
--- a/data/openssl/make.sh
+++ b/data/openssl/make.sh
@@ -1,11 +1,5 @@
-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
-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
+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/include "${PKG_DEST}"/usr
+cp -a "$(PKG_DEST_ _openssl1.0)"/usr/lib/ssl "${PKG_DEST}"/usr/lib
diff --git a/data/openssl/openssl-1.0.2o.tar.gz b/data/openssl/openssl-1.0.2o.tar.gz
deleted file mode 100644
index fff6a9003..000000000
--- a/data/openssl/openssl-1.0.2o.tar.gz
+++ /dev/null