diff --git a/openssl11-threads/openssl11-threads.patch b/openssl11-threads/openssl11-threads.patch
deleted file mode 100644
index 23eb8c1a76..0000000000
--- a/openssl11-threads/openssl11-threads.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Index: Configurations/unix-Makefile.tmpl
---- Configurations/unix-Makefile.tmpl.orig 2019-09-10 15:13:07.000000000 +0200
-+++ Configurations/unix-Makefile.tmpl 2019-09-11 07:48:48.831842000 +0200
-@@ -191,7 +191,7 @@
- # $(libdir) is chosen to be compatible with the GNU coding standards
- libdir={- file_name_is_absolute($libdir)
- ? $libdir : '$(INSTALLTOP)/$(LIBDIR)' -}
--ENGINESDIR=$(libdir)/engines-{- $sover_dirname -}
-+ENGINESDIR=$(libdir)/openssl/engines
-
- # Convenience variable for those who want to set the rpath in shared
- # libraries and applications
-@@ -274,8 +274,8 @@
- ? $libdir : '$(INSTALLTOP)/$(LIBDIR)' -}
- {- output_on() if $config{target} !~ /^mingw/; "" -}
-
--MANDIR=$(INSTALLTOP)/share/man
--DOCDIR=$(INSTALLTOP)/share/doc/$(BASENAME)
-+MANDIR=$(INSTALLTOP)/man
-+DOCDIR=$(INSTALLTOP)/share/openssl/doc/$(BASENAME)
- HTMLDIR=$(DOCDIR)/html
-
- # MANSUFFIX is for the benefit of anyone who may want to have a suffix
-@@ -544,7 +544,7 @@
-
- uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev
-
--install_docs: install_man_docs install_html_docs
-+install_docs: install_man_docs
-
- uninstall_docs: uninstall_man_docs uninstall_html_docs
- $(RM) -r $(DESTDIR)$(DOCDIR)
-@@ -960,7 +960,7 @@
- echo 'libdir=$(libdir)'; \
- fi; \
- echo 'includedir=$${prefix}/include'; \
-- echo 'enginesdir=$${libdir}/engines-{- $sover_dirname -}'; \
-+ echo 'enginesdir=$${libdir}/openssl/engines'; \
- echo ''; \
- echo 'Name: OpenSSL-libcrypto'; \
- echo 'Description: OpenSSL cryptography library'; \
-Index: util/process_docs.pl
---- util/process_docs.pl.orig 2019-09-10 15:13:07.000000000 +0200
-+++ util/process_docs.pl 2019-09-11 07:47:32.047435000 +0200
-@@ -78,7 +78,7 @@
- if defined $options{"dry-run"};
- }
-
--my $symlink_exists = eval { symlink("",""); 1 };
-+my $link_exists = eval { link("",""); 1 };
-
- foreach my $section (sort @{$options{section}}) {
- my $subdir = "man$section";
-@@ -170,11 +170,11 @@
- my $link_file = $_ . $suffix;
- my $link_path = catfile($output_dir, $link_file);
- if (! $options{remove}) {
-- if ($symlink_exists) {
-+ if ($link_exists) {
- print STDERR "DEBUG: Linking $link_path -> $output_file\n"
- if $options{debug};
- unless ($options{"dry-run"}) {
-- symlink $output_file, $link_path;
-+ link $output_file, $link_path;
- }
- } else {
- print STDERR "DEBUG: Copying $output_path to link_path\n"
diff --git a/openssl11-threads/openssl11-threads.spec b/openssl11-threads/openssl11-threads.spec
deleted file mode 100644
index 70797806db..0000000000
--- a/openssl11-threads/openssl11-threads.spec
+++ /dev/null
@@ -1,187 +0,0 @@
-##
-## openssl11-threads.spec -- OpenPKG RPM Package Specification
-## Copyright (c) 2000-2021 OpenPKG Project
-##
-## Permission to use, copy, modify, and distribute this software for
-## any purpose with or without fee is hereby granted, provided that
-## the above copyright notice and this permission notice appear in all
-## copies.
-##
-## THIS SOFTWARE IS PROVIDED ``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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-## 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.
-##
-
-# package version
-%define V_opkg 1.1.1k
-%define V_openssl 1.1.1k
-%define V_zlib 1.2.11
-
-# package information
-Name: openssl11-threads
-Summary: Cryptography and SSL/TLS Toolkit (V1.1, Threads Variant)
-URL: http://www.openssl.org/
-Vendor: The OpenSSL Project
-Packager: OpenPKG Project
-Distribution: OpenPKG Community
-Class: PLUS
-Group: SSL
-License: BSD-style
-Version: %{V_opkg}
-Release: 20210325
-
-# package options
-%option with_zlib no
-%option with_idea no
-%option with_pic no
-%option with_ssl3 no
-
-# list of sources
-Source0: https://www.openssl.org/source/openssl-%{V_openssl}.tar.gz
-Source1: http://www.zlib.net/zlib-%{V_zlib}.tar.gz
-Patch0: openssl11-threads.patch
-
-# build information
-BuildPreReq: OpenPKG, openpkg >= 20160101, perl, make, gcc
-PreReq: OpenPKG, openpkg >= 20160101, perl
-%if "%{with_zlib}" == "yes"
-BuildPreReq: zlib
-PreReq: zlib
-%endif
-
-%description
- The OpenSSL Project is a collaborative effort to develop a robust,
- commercial-grade, full-featured, and Open Source toolkit implementing the
- Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1)
- protocols with full-strength cryptography world-wide. The project is
- managed by a worldwide community of volunteers that use the Internet to
- communicate, plan, and develop the OpenSSL tookit and its related
- documentation.
-
-%track
- prog openssl11-threads:openssl = {
- version = %{V_openssl}
- url = https://www.openssl.org/source/
- regex = openssl-(1\.1\.\d+[a-z]?)\.tar\.gz
- }
- prog openssl11-threads:zlib = {
- version = %{V_zlib}
- url = http://www.zlib.net/
- regex = zlib-(__VER__)\.tar\.gz
- }
-
-%prep
- %setup -q -n openssl-%{V_openssl}
-%if "%{with_zlib}" == "yes"
- %setup -q -n openssl-%{V_openssl} -D -T -a 1
-%endif
- %patch -p0
-
-%build
- %{l_shtool} subst \
- -e 's;BN_LLONG *;;' \
- Configure
- %{l_shtool} subst \
- -e 's;test "$OSTYPE" = msdosdjgpp;true;' \
- util/point.sh
- %{l_shtool} subst \
- -e 's;^\(# *define *DEVRANDOM_EGD\);\1 "%{l_prefix}/var/prngd/prngd.socket",;' \
- e_os.h
- %{l_shtool} subst \
- -e 's;"openssl";"%{l_prefix}/bin/openssl";' \
- tools/c_rehash.in
-%if "%{with_zlib}" == "yes"
- %{l_shtool} subst \
- -e "s;\\(-DZLIB_SHARED\\);-I`pwd`/zlib-%{V_zlib} \\1;" \
- Configure
- %{l_shtool} subst \
- -e 's;, "z",;, "%{l_prefix}/lib/openssl11-threads/zlib.so",;' \
- crypto/comp/c_zlib.c
-%endif
-
-%if "%{with_zlib}" == "yes"
- ( cd zlib-%{V_zlib}
- CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O}" \
- ./configure \
- --prefix=%{l_prefix} \
- --shared
- %{l_make} %{l_mflags -O}
- ) || exit $?
-%endif
- options="no-shared no-dso no-unit-test"
-%if "%{with_pic}" == "yes"
- options="$options -fPIC"
- case "%{l_platform -t}" in
- amd64-* ) options="$options no-asm" ;;
- sparc64-freebsd* ) options="$options no-asm" ;;
- esac
-%else
- case "%{l_platform -t}" in
- amd64-* ) options="$options -fPIC no-asm" ;;
- ia64-* ) options="$options -fPIC" ;;
- sparc64-freebsd* ) options="$options -fPIC no-asm" ;;
- esac
-%endif
- options="$options no-weak-ssl-ciphers"
-%if "%{with_zlib}" == "yes"
- options="$options zlib-dynamic"
-%else
- options="$options no-zlib"
-%endif
-%if "%{with_idea}" != "yes"
- options="$options no-idea"
-%endif
-%if "%{with_ssl3}" != "yes"
- options="$options no-ssl3"
-%endif
- options="$options threads"
- case "%{l_platform -t}" in
- amd64-* ) options="$options enable-ec_nistp_64_gcc_128" ;;
- esac
- PERL=%{l_prefix}/bin/perl \
- ./config \
- --prefix=%{l_prefix} \
- --openssldir=%{l_prefix}/etc/openssl \
- --libdir=lib \
- $options
- %{l_make} %{l_mflags -O}
-
-%install
- %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
- strip $RPM_BUILD_ROOT%{l_prefix}/bin/openssl >/dev/null 2>&1 || true
- ( cd $RPM_BUILD_ROOT%{l_prefix}
- rm -rf lib/openssl
- rm -rf etc/openssl
- rm -f bin/c_rehash
- rm -f bin/openssl
- mkdir include/openssl11-threads
- mv include/openssl include/openssl11-threads/
- mkdir lib/openssl11-threads
- mv lib/libcrypto.a lib/openssl11-threads/
- mv lib/libssl.a lib/openssl11-threads/
- rm -rf lib/pkgconfig
- rm -rf man
- ) || exit $?
-%if "%{with_zlib}" == "yes"
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/openssl11-threads
- %{l_shtool} install -c -m 644 \
- zlib-%{V_zlib}/libz.so \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/openssl11-threads/zlib.so
-%endif
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
-
-%files -f files
-
-%clean
-
diff --git a/openssl11/openssl11.patch b/openssl11/openssl11.patch
deleted file mode 100644
index 23eb8c1a76..0000000000
--- a/openssl11/openssl11.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Index: Configurations/unix-Makefile.tmpl
---- Configurations/unix-Makefile.tmpl.orig 2019-09-10 15:13:07.000000000 +0200
-+++ Configurations/unix-Makefile.tmpl 2019-09-11 07:48:48.831842000 +0200
-@@ -191,7 +191,7 @@
- # $(libdir) is chosen to be compatible with the GNU coding standards
- libdir={- file_name_is_absolute($libdir)
- ? $libdir : '$(INSTALLTOP)/$(LIBDIR)' -}
--ENGINESDIR=$(libdir)/engines-{- $sover_dirname -}
-+ENGINESDIR=$(libdir)/openssl/engines
-
- # Convenience variable for those who want to set the rpath in shared
- # libraries and applications
-@@ -274,8 +274,8 @@
- ? $libdir : '$(INSTALLTOP)/$(LIBDIR)' -}
- {- output_on() if $config{target} !~ /^mingw/; "" -}
-
--MANDIR=$(INSTALLTOP)/share/man
--DOCDIR=$(INSTALLTOP)/share/doc/$(BASENAME)
-+MANDIR=$(INSTALLTOP)/man
-+DOCDIR=$(INSTALLTOP)/share/openssl/doc/$(BASENAME)
- HTMLDIR=$(DOCDIR)/html
-
- # MANSUFFIX is for the benefit of anyone who may want to have a suffix
-@@ -544,7 +544,7 @@
-
- uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev
-
--install_docs: install_man_docs install_html_docs
-+install_docs: install_man_docs
-
- uninstall_docs: uninstall_man_docs uninstall_html_docs
- $(RM) -r $(DESTDIR)$(DOCDIR)
-@@ -960,7 +960,7 @@
- echo 'libdir=$(libdir)'; \
- fi; \
- echo 'includedir=$${prefix}/include'; \
-- echo 'enginesdir=$${libdir}/engines-{- $sover_dirname -}'; \
-+ echo 'enginesdir=$${libdir}/openssl/engines'; \
- echo ''; \
- echo 'Name: OpenSSL-libcrypto'; \
- echo 'Description: OpenSSL cryptography library'; \
-Index: util/process_docs.pl
---- util/process_docs.pl.orig 2019-09-10 15:13:07.000000000 +0200
-+++ util/process_docs.pl 2019-09-11 07:47:32.047435000 +0200
-@@ -78,7 +78,7 @@
- if defined $options{"dry-run"};
- }
-
--my $symlink_exists = eval { symlink("",""); 1 };
-+my $link_exists = eval { link("",""); 1 };
-
- foreach my $section (sort @{$options{section}}) {
- my $subdir = "man$section";
-@@ -170,11 +170,11 @@
- my $link_file = $_ . $suffix;
- my $link_path = catfile($output_dir, $link_file);
- if (! $options{remove}) {
-- if ($symlink_exists) {
-+ if ($link_exists) {
- print STDERR "DEBUG: Linking $link_path -> $output_file\n"
- if $options{debug};
- unless ($options{"dry-run"}) {
-- symlink $output_file, $link_path;
-+ link $output_file, $link_path;
- }
- } else {
- print STDERR "DEBUG: Copying $output_path to link_path\n"
diff --git a/openssl11/openssl11.spec b/openssl11/openssl11.spec
deleted file mode 100644
index 75cc168514..0000000000
--- a/openssl11/openssl11.spec
+++ /dev/null
@@ -1,215 +0,0 @@
-##
-## openssl11.spec -- OpenPKG RPM Package Specification
-## Copyright (c) 2000-2021 OpenPKG Project
-##
-## Permission to use, copy, modify, and distribute this software for
-## any purpose with or without fee is hereby granted, provided that
-## the above copyright notice and this permission notice appear in all
-## copies.
-##
-## THIS SOFTWARE IS PROVIDED ``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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-## 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.
-##
-
-# package version
-%define V_opkg 1.1.1k
-%define V_openssl 1.1.1k
-%define V_zlib 1.2.11
-
-# package information
-Name: openssl11
-Summary: Cryptography and SSL/TLS Toolkit (V1.1)
-URL: http://www.openssl.org/
-Vendor: The OpenSSL Project
-Packager: OpenPKG Project
-Distribution: OpenPKG Community
-Class: PLUS
-Group: SSL
-License: BSD-style
-Version: %{V_opkg}
-Release: 20210325
-
-# package options
-%option with_zlib no
-%option with_idea no
-%option with_pic no
-%option with_ssl3 no
-%option with_openssl no
-
-# list of sources
-Source0: https://www.openssl.org/source/openssl-%{V_openssl}.tar.gz
-Source1: http://www.zlib.net/zlib-%{V_zlib}.tar.gz
-Patch0: openssl11.patch
-
-# build information
-BuildPreReq: OpenPKG, openpkg >= 20160101, perl, make, gcc
-PreReq: OpenPKG, openpkg >= 20160101, perl
-%if "%{with_zlib}" == "yes"
-BuildPreReq: zlib
-PreReq: zlib
-%endif
-
-%description
- The OpenSSL Project is a collaborative effort to develop a robust,
- commercial-grade, full-featured, and Open Source toolkit implementing the
- Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1)
- protocols with full-strength cryptography world-wide. The project is
- managed by a worldwide community of volunteers that use the Internet to
- communicate, plan, and develop the OpenSSL tookit and its related
- documentation.
-
-%track
- prog openssl11:openssl = {
- version = %{V_openssl}
- url = https://www.openssl.org/source/
- regex = openssl-(1\.1\.\d+[a-z]?)\.tar\.gz
- }
- prog openssl11:zlib = {
- version = %{V_zlib}
- url = http://www.zlib.net/
- regex = zlib-(__VER__)\.tar\.gz
- }
-
-%prep
- %setup -q -n openssl-%{V_openssl}
-%if "%{with_zlib}" == "yes"
- %setup -q -n openssl-%{V_openssl} -D -T -a 1
-%endif
- %patch -p0
-
-%build
- %{l_shtool} subst \
- -e 's;BN_LLONG *;;' \
- Configure
- %{l_shtool} subst \
- -e 's;test "$OSTYPE" = msdosdjgpp;true;' \
- util/point.sh
- %{l_shtool} subst \
- -e 's;^\(# *define *DEVRANDOM_EGD\);\1 "%{l_prefix}/var/prngd/prngd.socket",;' \
- e_os.h
- %{l_shtool} subst \
- -e 's;"openssl";"%{l_prefix}/bin/openssl";' \
- tools/c_rehash.in
-%if "%{with_zlib}" == "yes"
- %{l_shtool} subst \
- -e "s;\\(-DZLIB_SHARED\\);-I`pwd`/zlib-%{V_zlib} \\1;" \
- Configure
- %{l_shtool} subst \
- -e 's;, "z",;, "%{l_prefix}/lib/openssl/zlib.so",;' \
- crypto/comp/c_zlib.c
-%endif
-
-%if "%{with_zlib}" == "yes"
- ( cd zlib-%{V_zlib}
- CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O}" \
- ./configure \
- --prefix=%{l_prefix} \
- --shared
- %{l_make} %{l_mflags -O}
- ) || exit $?
-%endif
- options="no-shared no-dso no-unit-test"
-%if "%{with_pic}" == "yes"
- options="$options -fPIC"
- case "%{l_platform -t}" in
- amd64-* ) options="$options no-asm" ;;
- sparc64-freebsd* ) options="$options no-asm" ;;
- esac
-%else
- case "%{l_platform -t}" in
- amd64-* ) options="$options -fPIC no-asm" ;;
- ia64-* ) options="$options -fPIC" ;;
- sparc64-freebsd* ) options="$options -fPIC no-asm" ;;
- esac
-%endif
- options="$options no-weak-ssl-ciphers"
-%if "%{with_zlib}" == "yes"
- options="$options zlib-dynamic"
-%else
- options="$options no-zlib"
-%endif
-%if "%{with_idea}" != "yes"
- options="$options no-idea"
-%endif
-%if "%{with_ssl3}" != "yes"
- options="$options no-ssl3"
-%endif
- options="$options no-threads"
- case "%{l_platform -t}" in
- amd64-* ) options="$options enable-ec_nistp_64_gcc_128" ;;
- esac
- PERL=%{l_prefix}/bin/perl \
- ./config \
- --prefix=%{l_prefix} \
- --openssldir=%{l_prefix}/etc/openssl \
- --libdir=lib \
- $options
- %{l_make} %{l_mflags -O}
-
-%install
- %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
- strip $RPM_BUILD_ROOT%{l_prefix}/bin/openssl >/dev/null 2>&1 || true
- ( cd $RPM_BUILD_ROOT%{l_prefix}
- rm -rf lib/openssl
- rm -rf etc/openssl/private
- rm -rf etc/openssl/certs
- rm -rf etc/openssl/misc
- rm -rf etc/openssl/lib
- mv bin/c_rehash bin/openssl-crehash
- cd man
- rm -rf man3
- for dir in man[1-9]; do
- for file in `cd $dir; echo *`; do
- mv $dir/$file $dir/openssl_$file
- done
- done
- ) || exit $?
-%if "%{with_zlib}" == "yes"
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/openssl
- %{l_shtool} install -c -m 644 \
- zlib-%{V_zlib}/libz.so \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/openssl/zlib.so
-%endif
-%if "%{with_openssl}" != "yes"
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/etc/openssl
- mv $RPM_BUILD_ROOT%{l_prefix}/bin/openssl \
- $RPM_BUILD_ROOT%{l_prefix}/bin/openssl11
- mv $RPM_BUILD_ROOT%{l_prefix}/bin/openssl-crehash \
- $RPM_BUILD_ROOT%{l_prefix}/bin/openssl11-crehash
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/include/openssl11 \
- $RPM_BUILD_ROOT%{l_prefix}/lib/openssl11
- mv $RPM_BUILD_ROOT%{l_prefix}/include/openssl \
- $RPM_BUILD_ROOT%{l_prefix}/include/openssl11/
- mv $RPM_BUILD_ROOT%{l_prefix}/lib/lib*.a \
- $RPM_BUILD_ROOT%{l_prefix}/lib/openssl11/
- mv $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/libcrypto.pc \
- $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/libcrypto11.pc
- mv $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/libssl.pc \
- $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/libssl11.pc
- mv $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/openssl.pc \
- $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/openssl11.pc
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/man
-%endif
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
- %{l_files_std} \
-%if "%{with_openssl}" == "yes"
- '%config %{l_prefix}/etc/openssl/openssl.cnf'
-%endif
-
-%files -f files
-
-%clean
-